From owner-svn-ports-all@FreeBSD.ORG Thu Dec 13 11:54:22 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 20E1D111; Thu, 13 Dec 2012 11:54:22 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 03BEC8FC15; Thu, 13 Dec 2012 11:54:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDBsLw0025012; Thu, 13 Dec 2012 11:54:21 GMT (envelope-from araujo@svn.freebsd.org) Received: (from araujo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDBsF2c024966; Thu, 13 Dec 2012 11:54:15 GMT (envelope-from araujo@svn.freebsd.org) Message-Id: <201212131154.qBDBsF2c024966@svn.freebsd.org> From: Marcelo Araujo Date: Thu, 13 Dec 2012 11:54:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308846 - in head/devel/subcommander2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 11:54:22 -0000 Author: araujo Date: Thu Dec 13 11:54:14 2012 New Revision: 308846 URL: http://svnweb.freebsd.org/changeset/ports/308846 Log: - Update to 2.0.0.b5.2. PR: ports/172504 Submitted by: KATO Tsuguru Added: head/devel/subcommander2/files/patch-configure.ac (contents, props changed) head/devel/subcommander2/files/patch-po__Makefile.am (contents, props changed) head/devel/subcommander2/files/patch-subcommander__BookmarkViewItemModel.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__CommitItemLvi.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__DiffSummarizeLvi.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__DiffViewModel.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__ListWidget.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__MainWindow.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__Makefile.am (contents, props changed) head/devel/subcommander2/files/patch-subcommander__ProjectWizard.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__RpViewTree.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__RpViewTreeProxyModel.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__RpViewWhatsThis.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__WcSelection.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__WcViewTreeProxyModel.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__WcViewWhatsThis.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__commands__IgnoreCmd.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__commands__ScCmd.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp (contents, props changed) head/devel/subcommander2/files/patch-subcommander__subcommander.cpp (contents, props changed) head/devel/subcommander2/files/patch-sublib__CrashHandler.cpp (contents, props changed) head/devel/subcommander2/files/patch-sublib__ErrorDialog.cpp (contents, props changed) head/devel/subcommander2/files/patch-sublib__Makefile.am (contents, props changed) head/devel/subcommander2/files/patch-sublib__MsgHandler.cpp (contents, props changed) head/devel/subcommander2/files/patch-sublib__Utility.cpp (contents, props changed) head/devel/subcommander2/files/patch-submerge__Makefile.am (contents, props changed) head/devel/subcommander2/files/patch-submerge__TextLineNrWidget.cpp (contents, props changed) head/devel/subcommander2/files/patch-svn__VisualMerge.cpp (contents, props changed) head/devel/subcommander2/files/patch-svn__WcEntry.cpp (contents, props changed) head/devel/subcommander2/files/patch-svn__WcEntry.h (contents, props changed) head/devel/subcommander2/files/patch-util__ErrorCodes.cpp (contents, props changed) Deleted: head/devel/subcommander2/files/patch-WcEntry head/devel/subcommander2/files/patch-configure head/devel/subcommander2/files/patch-subcommander-Makefile.in head/devel/subcommander2/files/patch-sublib-Makefile.in head/devel/subcommander2/files/patch-submerge-Makefile.in Modified: head/devel/subcommander2/Makefile (contents, props changed) head/devel/subcommander2/distinfo (contents, props changed) Modified: head/devel/subcommander2/Makefile ============================================================================== --- head/devel/subcommander2/Makefile Thu Dec 13 11:53:08 2012 (r308845) +++ head/devel/subcommander2/Makefile Thu Dec 13 11:54:14 2012 (r308846) @@ -2,43 +2,41 @@ # $FreeBSD$ PORTNAME= subcommander -PORTVERSION= 2.0.0.b5 -PORTREVISION= 8 +PORTVERSION= 2.0.0.b5.2 CATEGORIES= devel -MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/46766/ -DISTNAME= Subcommander-${PORTVERSION:S/.b/b/g}p1 +MASTER_SITES= DEBIAN +DISTNAME= ${PORTNAME}_${PORTVERSION:R:S,.b,~b,}p${PORTVERSION:E}.orig MAINTAINER= ports@FreeBSD.org COMMENT= Qt4 based multiplatform subversion client, diff & merge tool -DEPRECATED= No more public distfiles -EXPIRATION_DATE= 2012-11-26 +LICENSE= GPLv2 -LIB_DEPENDS= neon:${PORTSDIR}/www/neon29 \ - boost_thread:${PORTSDIR}/devel/boost-libs \ - svn_client-1:${PORTSDIR}/devel/subversion \ - sasl2:${PORTSDIR}/security/cyrus-sasl2 +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ + svn_client-1:${PORTSDIR}/devel/subversion LATEST_LINK= subcommander2 CONFLICTS= subcommander-1.* -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.b/b/g} -USE_DOS2UNIX= *.cpp *.h +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E} -GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_DOS2UNIX= *.cpp *.h +USE_QT_VER= 4 +QT_COMPONENTS= corelib gui network qt3support moc_build rcc_build uic_build +QT_NONSTANDARD= yes USE_OPENSSL= yes -USE_QT4= qt3support gui network corelib moc_build uic_build rcc_build -CONFIGURE_ARGS+= --with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \ - --with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \ - --with-apr=${LOCALBASE}/bin/apr-1-config \ - --with-apr-util=${LOCALBASE}/bin/apu-1-config \ - --with-openssl=${OPENSSLBASE} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS} +USE_GMAKE= yes +USE_AUTOTOOLS= aclocal automake autoheader autoconf +ACLOCAL_ARGS= -I ac-macros +AUTOMAKE_ARGS= --with-boost=${LOCALBASE}/include \ + --with-subversion=${LOCALBASE} --with-qt=${QT_PREFIX} \ + --with-apr=${LOCALBASE}/bin/apr-1-config \ + --with-apr-util=${LOCALBASE}/bin/apu-1-config \ + --with-openssl=${OPENSSLBASE} + MAKE_JOBS_SAFE= yes -post-extract: - @${CHMOD} +x ${WRKSRC}/configure +CPPFLAGS+= -I${QT_INCDIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include Modified: head/devel/subcommander2/distinfo ============================================================================== --- head/devel/subcommander2/distinfo Thu Dec 13 11:53:08 2012 (r308845) +++ head/devel/subcommander2/distinfo Thu Dec 13 11:54:14 2012 (r308846) @@ -1,2 +1,2 @@ -SHA256 (Subcommander-2.0.0b5p1.tar.gz) = 52820395f76b542e34f5fa6ffb682db8cc9024fc7583e9cbb2d9b078334d7e7c -SIZE (Subcommander-2.0.0b5p1.tar.gz) = 7279236 +SHA256 (subcommander_2.0.0~b5p2.orig.tar.gz) = d6b346fc4f46779154e1a5903eeca8eb2526eef94a20c533afbea415ba7e16d4 +SIZE (subcommander_2.0.0~b5p2.orig.tar.gz) = 7355565 Added: head/devel/subcommander2/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-configure.ac Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,223 @@ +--- configure.ac.orig 2009-09-29 06:27:22.000000000 +0900 ++++ configure.ac 2012-05-10 05:20:28.000000000 +0900 +@@ -8,7 +8,8 @@ + AM_CONFIG_HEADER(config.h) + AC_CONFIG_SRCDIR(sublib/version.in.h) + AC_CONFIG_AUX_DIR(ac-helpers) +-AM_INIT_AUTOMAKE(subdir-objects) ++AM_INIT_AUTOMAKE(subdir-objects foreign) ++AM_MAINTAINER_MODE + AH_TOP([ + #ifndef SC_CONFIG_H + #define SC_CONFIG_H +@@ -141,14 +142,14 @@ + + AC_LANG(C++) + AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( ++ [AC_LANG_PROGRAM( + [[ + #include + ]], + [[ + boost::shared_ptr ptr; + ]] +- ), ++ )], + [ + AC_MSG_RESULT([yes]) + ],[ +@@ -190,10 +191,10 @@ + + AC_LANG(C++) + AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( +- [[#include ]], ++ [AC_LANG_PROGRAM( ++ [[#error include ]], + [[ne_sock_exit()]] +- ), ++ )], + [ + AC_MSG_RESULT([yes]) + AC_MSG_RESULT([ headers $NEON_INCLUDES]) +@@ -241,14 +242,14 @@ + + AC_LANG(C++) + AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( +- [[#include ]], ++ [AC_LANG_PROGRAM( ++ [[#error include ]], + [[ + #if ! SERF_VERSION_AT_LEAST(0,3,0) + # error no serf! + #endif // serf + ]] +- ), ++ )], + [ + AC_MSG_RESULT([yes]) + AC_MSG_RESULT([ headers $SERF_INCLUDES]) +@@ -273,9 +274,9 @@ + AC_SUBST(NET_LIBS) + + +-if test x$found_neon = xno -a x$found_serf = xno; then +- AC_MSG_ERROR([found neither neon nor serf, try setting --with-neon or --with-serf]) +-fi ++#if test x$found_neon = xno -a x$found_serf = xno; then ++# AC_MSG_ERROR([found neither neon nor serf, try setting --with-neon or --with-serf]) ++#fi + + + ## +@@ -357,9 +358,9 @@ + goodsvn="bad"; + elif test $SVN_MAJOR -eq 1 -a $SVN_MINOR -le 3; then + goodsvn="bad"; +-elif test x$SVN_VERSION == x1.4.4; then ++elif test x$SVN_VERSION = x1.4.4; then + goodsvn="bad"; +-elif test x$SVN_VERSION == x1.5.0; then ++elif test x$SVN_VERSION = x1.5.0; then + goodsvn="bad"; + fi + +@@ -368,26 +369,14 @@ + if test $SVN_MAJOR -ge 1; then + + SVN_LIBS_ALL="$SVN_LIBS -lsvn_client-1 -lsvn_wc-1 -lsvn_repos-1" +- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_svn-1 -lsvn_ra_local-1" +- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1 -lsvn_fs_fs-1" ++ SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1" ++ SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1" + SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_delta-1 -lsvn_diff-1" + SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1" + +- if test $SVN_MINOR -eq 4; then +- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_dav-1" +- elif test $SVN_MINOR -ge 5; then +- if test x$found_neon = xyes; then +- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_neon-1" +- fi +- if test x$found_serf = xyes; then +- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_serf-1" +- fi +- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs_util-1" +- fi +- + fi + +-if test x$goodsvn == xok; then ++if test x$goodsvn = xok; then + AC_MSG_RESULT([yes]) + AC_MSG_RESULT([ headers $SVN_INCLUDES]) + AC_MSG_RESULT([ libraries $SVN_LIBS_ALL]) +@@ -443,7 +432,7 @@ + + AC_LANG(C++) + AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( ++ [AC_LANG_PROGRAM( + [[ + #include + #include +@@ -454,7 +443,7 @@ + ERR_free_strings(); + unsigned long openssl = OPENSSL_VERSION_NUMBER; + ]] +- ), ++ )], + [ + AC_MSG_RESULT([yes]) + ],[ +@@ -500,14 +489,14 @@ + + AC_LANG(C++) + AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( ++ [AC_LANG_PROGRAM( + [[ + #include + ]], + [[ + unsigned long num = DB_VERSION_MAJOR; + ]] +- ), ++ )], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db]) +@@ -635,11 +624,11 @@ + + QT_BIN="$qt_path/bin" + QT_PATH="$qt_path" +- QT_LIBPATH="$qt_path/lib" ++ QT_LIBPATH="$qt_path/lib/qt4" + + # extract version numbers of qt + +- QT_VERSION=`$QT_BIN/moc -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"` ++ QT_VERSION=`$QT_BIN/moc-qt4 -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"` + QT_MAJOR=`echo $QT_VERSION | sed "s/\(.*\)[[.]].*[[.]].*/\1/"` + QT_MINOR=`echo $QT_VERSION | sed "s/.*[[.]]\(.*\)[[.]].*/\1/"` + +@@ -669,7 +658,7 @@ + *) + # any other Unix platform directly link with the libs + +- QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/Qt" ++ QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/qt4" + QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore" + ;; + esac +@@ -719,10 +708,10 @@ + + AC_LANG(C++) + AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( ++ [AC_LANG_PROGRAM( + [[#include ]], + [[QWidget* w = new QWidget();]] +- ), ++ )], + [ + AC_MSG_RESULT([yes]) + AC_MSG_RESULT([ version $QT_VERSION]) +@@ -816,7 +805,7 @@ + + AC_LANG(C++) + AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( ++ [AC_LANG_PROGRAM( + [[ + #include + ]], +@@ -825,7 +814,7 @@ + #error no stlport! + #endif // _STLPORT_VERSION + ]] +- ), ++ )], + [ + AC_MSG_RESULT([yes]) + has_stlport="yes" +@@ -853,7 +842,7 @@ + AC_MSG_CHECKING([wether we have a working stl]) + AC_LANG(C++) + AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( ++ [AC_LANG_PROGRAM( + [[ + ]], + [[ +@@ -861,7 +850,7 @@ + # error needs stlport! + #endif // __GNUC__ + ]] +- ), ++ )], + [ + AC_MSG_RESULT([yes]) + ],[ Added: head/devel/subcommander2/files/patch-po__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-po__Makefile.am Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,16 @@ +--- po/Makefile.am.orig 2009-05-17 22:56:55.000000000 +0900 ++++ po/Makefile.am 2012-05-10 05:36:32.000000000 +0900 +@@ -1,11 +1,12 @@ + ## process this file with automake to produce Makefile.in + +-locdir=$(datadir)/locale ++locdir=$(DESTDIR)/$(datadir)/locale + + all: po-merge de.mo zh_CN.mo + + + install-data-local: ++ mkdir -p $(locdir)/de/LC_MESSAGES/ $(locdir)/zh_CN/LC_MESSAGES/ + cp de.mo $(locdir)/de/LC_MESSAGES/Subcommander.mo + cp zh_CN.mo $(locdir)/zh_CN/LC_MESSAGES/Subcommander.mo + Added: head/devel/subcommander2/files/patch-subcommander__BookmarkViewItemModel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__BookmarkViewItemModel.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,12 @@ +--- subcommander/BookmarkViewItemModel.cpp.orig 2009-09-20 18:24:16.000000000 +0900 ++++ subcommander/BookmarkViewItemModel.cpp 2012-05-10 05:38:50.000000000 +0900 +@@ -219,7 +219,8 @@ + if( !advance ) + return false; + +- _frame = ++_frame % ActiveDecorationFrames; ++ ++_frame; ++ _frame = _frame % ActiveDecorationFrames; + return true; + } + Added: head/devel/subcommander2/files/patch-subcommander__CommitItemLvi.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__CommitItemLvi.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/CommitItemLvi.cpp.orig 2008-07-13 20:40:21.000000000 +0900 ++++ subcommander/CommitItemLvi.cpp 2012-05-10 05:39:57.000000000 +0900 +@@ -32,7 +32,7 @@ + CommitItemLvi::CommitItemLvi( const svn::CommitItemPtr item, + const QString& itemStr ) : super(), _item(item), _itemStr(itemStr) + { +- char* kinds[] = ++ const char* kinds[] = + { + _n("none"), + _n("file"), Added: head/devel/subcommander2/files/patch-subcommander__DiffSummarizeLvi.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__DiffSummarizeLvi.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,20 @@ +--- subcommander/DiffSummarizeLvi.cpp.orig 2007-08-04 16:22:10.000000000 +0900 ++++ subcommander/DiffSummarizeLvi.cpp 2012-05-10 05:41:05.000000000 +0900 +@@ -13,7 +13,7 @@ + #include "svn/DiffSummarize.h" + + +-static char* getSummarizeCode( svn::DiffSummarizeKind kind ) ++static char* const getSummarizeCode( svn::DiffSummarizeKind kind ) + { + switch( kind ) + { +@@ -25,7 +25,7 @@ + } + } + +-static char* getNodCode( svn::NodeKind kind ) ++static char* const getNodCode( svn::NodeKind kind ) + { + switch( kind ) + { Added: head/devel/subcommander2/files/patch-subcommander__DiffViewModel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__DiffViewModel.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/DiffViewModel.cpp.orig 2008-12-31 00:58:11.000000000 +0900 ++++ subcommander/DiffViewModel.cpp 2012-05-10 05:50:30.000000000 +0900 +@@ -78,7 +78,7 @@ + { + public: + DiffThread( ScModel* model, DiffViewModel::DiffCmds& cmds ) +- : _model(model), _cmds(cmds), _run(true) ++ : _run(true), _model(model), _cmds(cmds) + { + } + Added: head/devel/subcommander2/files/patch-subcommander__ListWidget.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__ListWidget.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,20 @@ +--- subcommander/ListWidget.cpp.orig 2009-09-13 01:49:22.000000000 +0900 ++++ subcommander/ListWidget.cpp 2012-05-10 06:04:40.000000000 +0900 +@@ -134,7 +134,7 @@ + "help" + "

" + "* pressing SHIFT-F1 in the working copy view will display a detailed" +-"description of the the columns and their possible values." ++" description of the the columns and their possible values." + "

" + "internationalization (i18n)" + "

" +@@ -151,6 +151,8 @@ + "set any repository folder as branch or tag folder. subcommander needs" + " only to know WHERE you keep your branches and tags. It does NOT " + "require that they are named 'branches' or 'tags'." ++"
* for anonymous (read only) access to the preconfigured subcommander" ++" repository, use the username 'guest' with an empty password." + "

" + "" + ); Added: head/devel/subcommander2/files/patch-subcommander__MainWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__MainWindow.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/MainWindow.cpp.orig 2009-01-11 23:46:56.000000000 +0900 ++++ subcommander/MainWindow.cpp 2012-05-10 05:51:23.000000000 +0900 +@@ -260,7 +260,7 @@ + void MainWindow::settings( const QString& selected ) + { + SettingsDialog* sd = new SettingsDialog( _q("subcommander:settings"), this ); +- SettingsInfo* si; ++ //SettingsInfo* si; + + #if 0 + // projects root item Added: head/devel/subcommander2/files/patch-subcommander__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__Makefile.am Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,23 @@ +--- subcommander/Makefile.am.orig 2009-09-20 18:10:18.000000000 +0900 ++++ subcommander/Makefile.am 2012-05-10 05:35:09.000000000 +0900 +@@ -1,7 +1,7 @@ + ## process this file with automake to produce Makefile.in + + +-QT_MOC = @QT_BIN@/moc ++QT_MOC = @QT_BIN@/moc-qt4 + + scdir = $(datadir)/subcommander + icondir = $(scdir)/icons/default +@@ -125,9 +125,9 @@ + + bin_PROGRAMS = subcommander + +-subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib \ ++subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lsublib -lutil \ + @QT_LIBS@ @SVN_LIBS_ALL@ @STLPORT_LIBS@ @NET_LIBS@ \ +- @APU_LIBS@ @APR_LIBS@ -lsasl2 -lz ++ @APU_LIBS@ @APR_LIBS@ -lz + + subcommander_DEPENDENCIES = ../sublib/libsublib.a ../svn/libsvn.a ../util/libutil.a + Added: head/devel/subcommander2/files/patch-subcommander__ProjectWizard.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__ProjectWizard.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/ProjectWizard.cpp.orig 2008-11-15 20:42:38.000000000 +0900 ++++ subcommander/ProjectWizard.cpp 2012-05-10 05:32:51.000000000 +0900 +@@ -363,6 +363,8 @@ + sc::String wcPath = sc::String(field("WcPath").toString().utf8()); + sc::String wcUrl; + ++ if ( wcPath.right(1) == "/" ) wcPath = wcPath.left(wcPath.getByteCnt() - 1); ++ + svn::Client::getUrlFromPath( wcPath, wcUrl ); + + setField( "TrunkUrl", QString::fromUtf8(wcUrl) ); Added: head/devel/subcommander2/files/patch-subcommander__RpViewTree.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__RpViewTree.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/RpViewTree.cpp.orig 2008-08-17 17:00:54.000000000 +0900 ++++ subcommander/RpViewTree.cpp 2012-05-10 06:02:40.000000000 +0900 +@@ -113,7 +113,7 @@ + + + RpViewTree::RpViewTree( const sc::String& root, RpViewState* state, ActionStorage* as, QWidget* parent ) +-: super(parent), _state(state), _actions(as), _itemData(new RpViewEntryData()) ++: super(parent), _itemData(new RpViewEntryData()), _state(state), _actions(as) + { + setTextElideMode(Qt::ElideMiddle); + setAllColumnsShowFocus(true); Added: head/devel/subcommander2/files/patch-subcommander__RpViewTreeProxyModel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__RpViewTreeProxyModel.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/RpViewTreeProxyModel.cpp.orig 2008-08-09 15:55:24.000000000 +0900 ++++ subcommander/RpViewTreeProxyModel.cpp 2012-05-10 05:52:30.000000000 +0900 +@@ -28,7 +28,7 @@ + { + QVariant value = sourceModel()->data( mapToSource(index), role ); + +- if( index.column() == 0 && role == Qt::DisplayRole || role == Qt::EditRole ) ++ if( (index.column() == 0 && role == Qt::DisplayRole) || role == Qt::EditRole ) + { + QString temp = value.toString(); + Added: head/devel/subcommander2/files/patch-subcommander__RpViewWhatsThis.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__RpViewWhatsThis.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,20 @@ +--- subcommander/RpViewWhatsThis.cpp.orig 2007-06-26 04:28:49.000000000 +0900 ++++ subcommander/RpViewWhatsThis.cpp 2012-05-10 05:47:04.000000000 +0900 +@@ -19,7 +19,7 @@ + ws += "" + _q("repository copy view columns") + ""; + ws += + "
" +- "" ++ "
" + ""; + ws += ""; + ws += "" +@@ -51,7 +51,7 @@ + ws += ""; + ws += "" + + "" +- ""; ++ "" + "
" + _q("name") + "" + _q("the name of an item - the header shows its name and the repository url") + "
" + _q("last committed date") + "" + _q("an items last committed date") + "
" + ""; + Added: head/devel/subcommander2/files/patch-subcommander__WcSelection.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__WcSelection.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,13 @@ +--- subcommander/WcSelection.cpp.orig 2007-09-16 23:37:07.000000000 +0900 ++++ subcommander/WcSelection.cpp 2012-05-10 05:43:53.000000000 +0900 +@@ -89,8 +89,8 @@ + + svn::WcStatusPtr status = *(_statuss.begin()); + +- return !status->isAddable() +- && status->isChanged() ++ return (!status->isAddable() ++ && status->isChanged()) + || status->isDir(); + } + Added: head/devel/subcommander2/files/patch-subcommander__WcViewTreeProxyModel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__WcViewTreeProxyModel.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/WcViewTreeProxyModel.cpp.orig 2009-01-18 18:57:43.000000000 +0900 ++++ subcommander/WcViewTreeProxyModel.cpp 2012-05-10 05:44:52.000000000 +0900 +@@ -33,7 +33,7 @@ + { + QVariant value = sourceModel()->data( mapToSource(index), role ); + +- if( index.column() == 0 && role == Qt::DisplayRole || role == Qt::EditRole ) ++ if( (index.column() == 0 && role == Qt::DisplayRole) || role == Qt::EditRole ) + { + QString temp = value.toString(); + Added: head/devel/subcommander2/files/patch-subcommander__WcViewWhatsThis.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__WcViewWhatsThis.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/WcViewWhatsThis.cpp.orig 2009-01-03 02:33:10.000000000 +0900 ++++ subcommander/WcViewWhatsThis.cpp 2012-05-10 05:48:12.000000000 +0900 +@@ -162,7 +162,7 @@ + "" + ""; + ws += "" +- "not modified" "*modified"; ++ "not modified" "*modified" + "" + "" + ""; Added: head/devel/subcommander2/files/patch-subcommander__commands__IgnoreCmd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__commands__IgnoreCmd.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- subcommander/commands/IgnoreCmd.cpp.orig 2008-12-30 23:58:59.000000000 +0900 ++++ subcommander/commands/IgnoreCmd.cpp 2012-05-10 05:53:54.000000000 +0900 +@@ -30,7 +30,7 @@ + + void IgnoreCmd::run() + { +- sc::Error* err; ++ sc::Error* err (0); + + _prgscb->started( _param, getCancel() ); + Added: head/devel/subcommander2/files/patch-subcommander__commands__ScCmd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__commands__ScCmd.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,18 @@ +--- subcommander/commands/ScCmd.cpp.orig 2008-11-23 01:46:19.000000000 +0900 ++++ subcommander/commands/ScCmd.cpp 2012-05-10 05:55:05.000000000 +0900 +@@ -28,13 +28,13 @@ + _client = client; + _prgscb = progress; + +- apr_time_t t1 = apr_time_now(); ++ //apr_time_t t1 = apr_time_now(); + + //_prgscb->started( getId(), /*_param*/, getCancel() ); + run(); + //_prgscb->finished( getId(), /*_param*/, time ); + +- apr_time_t t2 = apr_time_now(); ++ //apr_time_t t2 = apr_time_now(); + + //_prgscb->time( _id, ((double)(t2-t1)/1000.0) ); + } Added: head/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,20 @@ +--- subcommander/settings/ToolsSettingsWidget.cpp.orig 2007-08-19 22:04:03.000000000 +0900 ++++ subcommander/settings/ToolsSettingsWidget.cpp 2012-05-10 05:29:12.000000000 +0900 +@@ -39,7 +39,7 @@ + vl->addStretch(1); + { + // diff command +- QLabel* diffLabel = new QLabel(_q("(visual) diff comand:"), this); ++ QLabel* diffLabel = new QLabel(_q("(visual) diff command:"), this); + QPushButton* diffBi = new QPushButton( _q("reset/builtin"), this ); + _diffEdit = new QLineEdit( this ); + QPushButton* diffEx = new ExternButton( this ); +@@ -59,7 +59,7 @@ + row++; + + // merge command +- QLabel* mergeLabel = new QLabel(_q("(visual) merge comand:"), this); ++ QLabel* mergeLabel = new QLabel(_q("(visual) merge command:"), this); + QPushButton* mergeBi = new QPushButton( _q("reset/builtin"), this ); + _mergeEdit = new QLineEdit( this ); + QPushButton* mergeEx = new ExternButton( this ); Added: head/devel/subcommander2/files/patch-subcommander__subcommander.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-subcommander__subcommander.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,32 @@ +--- subcommander/subcommander.cpp.orig 2009-09-20 18:10:18.000000000 +0900 ++++ subcommander/subcommander.cpp 2012-05-10 06:03:26.000000000 +0900 +@@ -64,12 +64,6 @@ + #endif // _WIN32 + } + +-void exit_neon() +-{ +-#ifdef _WIN32 +- ne_sock_exit(); +-#endif // _WIN32 +-} + + + /** main for running the tests. */ +@@ -123,7 +117,7 @@ + // no way to bring up a dialog if something went wrong in the basic + // initialization. + +- fprintf( stderr, e.getError()->getMessage() ); ++ fprintf( stderr, "%s", e.getError()->getMessage() ); + return EXIT_FAILURE; + } + +@@ -167,7 +161,6 @@ + //config.save(); + + exit_ssl(); +- exit_neon(); + + TargetRepository::teardown(); + stopStackProcess(); Added: head/devel/subcommander2/files/patch-sublib__CrashHandler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-sublib__CrashHandler.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,18 @@ +--- sublib/CrashHandler.cpp.orig 2007-08-19 22:04:03.000000000 +0900 ++++ sublib/CrashHandler.cpp 2012-05-10 05:56:28.000000000 +0900 +@@ -22,6 +22,7 @@ + #endif // _WIN32 + + ++#if _WIN32 + // helper + static const char* copyString( const sc::String& src ) + { +@@ -37,6 +38,7 @@ + QString sbj = _q("%1 [%2] crashed...").arg(getLongAppName()).arg(SUBCOMMANDER_VERSION); + return sc::String(sbj.toUtf8()); + } ++#endif + + static sc::String getMessage() + { Added: head/devel/subcommander2/files/patch-sublib__ErrorDialog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-sublib__ErrorDialog.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,18 @@ +--- sublib/ErrorDialog.cpp.orig 2007-08-19 22:04:03.000000000 +0900 ++++ sublib/ErrorDialog.cpp 2012-05-10 05:49:27.000000000 +0900 +@@ -219,6 +219,7 @@ + { + } + ++#if _WIN32 + static const char* copyString( const QString& s ) + { + QByteArray qs = s.toLocal8Bit(); +@@ -226,6 +227,7 @@ + strncpy( result, (const char*)qs, qs.length() ); + return result; + } ++#endif + + void ErrorDialog::send() + { Added: head/devel/subcommander2/files/patch-sublib__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-sublib__Makefile.am Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,19 @@ +--- sublib/Makefile.am.orig 2009-09-20 18:10:18.000000000 +0900 ++++ sublib/Makefile.am 2012-05-10 05:23:34.000000000 +0900 +@@ -1,6 +1,6 @@ + ## process this file with automake to produce Makefile.in + +-QT_MOC = @QT_BIN@/moc ++QT_MOC = @QT_BIN@/moc-qt4 + QT_RCC = @QT_BIN@/rcc + + scdir = $(datadir)/subcommander +@@ -121,7 +121,7 @@ + $(QT_MOC) $< -o $@ + + resources.cpp : resources.h +- $(QT_RCC) -name sublib -o $@ ../pics/sublib.qrc ++ $(QT_RCC) -name sublib -o $@ $(top_srcdir)/pics/sublib.qrc + + clean-local: + -rm -rf moc Added: head/devel/subcommander2/files/patch-sublib__MsgHandler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-sublib__MsgHandler.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,20 @@ +--- sublib/MsgHandler.cpp.orig 2007-08-19 22:04:03.000000000 +0900 ++++ sublib/MsgHandler.cpp 2012-05-10 05:58:52.000000000 +0900 +@@ -16,6 +16,9 @@ + // qt + #include + ++// sys ++#include ++ + + static void MessageHandler( QtMsgType type, const char *msg ) + { +@@ -28,6 +31,7 @@ + msgWarning( getLongAppName(), msg, _q("&Ok") ); + break; + case QtFatalMsg: ++ case QtCriticalMsg: + msgCritical( getLongAppName(), msg, _q("&Abort") ); + abort(); + } Added: head/devel/subcommander2/files/patch-sublib__Utility.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-sublib__Utility.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,10 @@ +--- sublib/Utility.cpp.orig 2009-09-20 18:10:18.000000000 +0900 ++++ sublib/Utility.cpp 2012-05-10 05:31:52.000000000 +0900 +@@ -27,6 +27,7 @@ + #endif // _WIN32 + + // sys ++#include + #include + + Added: head/devel/subcommander2/files/patch-submerge__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-submerge__Makefile.am Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,20 @@ +--- submerge/Makefile.am.orig 2008-06-23 02:19:21.000000000 +0900 ++++ submerge/Makefile.am 2012-05-10 05:28:09.000000000 +0900 +@@ -1,7 +1,7 @@ + ## process this file with automake to produce Makefile.in + + +-QT_MOC = @QT_BIN@/moc ++QT_MOC = @QT_BIN@/moc-qt4 + + scdir = $(datadir)/subcommander + icondir = $(scdir)/icons/default +@@ -29,7 +29,7 @@ + + bin_PROGRAMS = submerge + +-submerge_LDADD = -L../util -L../svn -L../sublib -lutil -lsvn -lsublib \ ++submerge_LDADD = -L../util -L../svn -L../sublib -lutil -lsublib -lsvn \ + @QT_LIBS@ @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_diff-1 \ + -lsvn_subr-1 @STLPORT_LIBS@ -lz + Added: head/devel/subcommander2/files/patch-submerge__TextLineNrWidget.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-submerge__TextLineNrWidget.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- submerge/TextLineNrWidget.cpp.orig 2010-06-20 22:28:45.000000000 +0900 ++++ submerge/TextLineNrWidget.cpp 2012-10-02 17:09:22.000000000 +0900 +@@ -71,7 +71,7 @@ + sc::Size lines = _model->getLineCnt(); + + char buf[16] = ""; +- _lnColumns = sprintf( buf, "%lu", lines ); ++ _lnColumns = sprintf( buf, "%lu", static_cast(lines) ); + + updateGeometry(); + } Added: head/devel/subcommander2/files/patch-svn__VisualMerge.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-svn__VisualMerge.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- svn/VisualMerge.cpp.orig 2006-01-18 05:40:34.000000000 +0900 ++++ svn/VisualMerge.cpp 2012-05-10 06:01:16.000000000 +0900 +@@ -19,7 +19,7 @@ + + VisualMerge::VisualMerge( svn_client_ctx_t* context, const sc::String& mergeCmd, + apr_pool_t* pool ) +-: _context(context), _mergeCmd(mergeCmd), _pool(pool) ++: _context(context), _pool(pool), _mergeCmd(mergeCmd) + { + } + Added: head/devel/subcommander2/files/patch-svn__WcEntry.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-svn__WcEntry.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- svn/WcEntry.cpp.orig 2008-11-09 01:23:48.000000000 +0900 ++++ svn/WcEntry.cpp 2012-10-02 17:12:20.000000000 +0900 +@@ -20,7 +20,7 @@ + { + } + +-WcEntry::WcEntry( svn_wc_entry_t* entry ) ++WcEntry::WcEntry( const svn_wc_entry_t* entry ) + { + _name = sc::String(entry->name); + _revision = entry->revision; Added: head/devel/subcommander2/files/patch-svn__WcEntry.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-svn__WcEntry.h Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- svn/WcEntry.h.orig 2008-11-09 01:23:48.000000000 +0900 ++++ svn/WcEntry.h 2012-10-02 17:12:50.000000000 +0900 +@@ -38,7 +38,7 @@ + WcEntry(); + + public: +- WcEntry( svn_wc_entry_t* ); ++ WcEntry( const svn_wc_entry_t* ); + WcEntry( const WcEntry& src ); + + Revnumber getRevnumber() const; Added: head/devel/subcommander2/files/patch-util__ErrorCodes.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subcommander2/files/patch-util__ErrorCodes.cpp Thu Dec 13 11:54:14 2012 (r308846) @@ -0,0 +1,11 @@ +--- util/ErrorCodes.cpp.orig 2006-02-13 00:25:44.000000000 +0900 ++++ util/ErrorCodes.cpp 2012-05-10 05:46:12.000000000 +0900 +@@ -28,7 +28,7 @@ + } + } + +- return errors[ErrUnknown]._msg; ++ return errors[ErrUnknown - SC_ERR_START]._msg; + } + + } // namespace