Attachment #128648 for bug #172504




# $FreeBSD: ports/devel/subcommander2/Makefile,v 1.32 2012/10/26 10:23:01 bapt Exp $

PORTNAME=	subcommander
PORTVERSION=	2.0.0.b5.2
PORTREVISION=	7
CATEGORIES=	devel
#MASTER_SITES=	http://www.tigris.org/files/documents/1759/47637/
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

LICENSE=	GPLv2
EXPIRATION_DATE=	2012-11-26

LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
		svn_client-1:${PORTSDIR}/devel/subversion
		svn_client-1:${PORTSDIR}/devel/subversion \
		sasl2:${PORTSDIR}/security/cyrus-sasl2

LATEST_LINK=	subcommander2
CONFLICTS=	subcommander-1.*

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E}
USE_DOS2UNIX=	*.cpp *.h

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_GMAKE=	yes
USE_AUTOTOOLS=	aclocal automake autoheader autoconf
ACLOCAL_ARGS=	-I ac-macros
AUTOMAKE_ARGS=	--add-missing --copy --force-missing --foreign
CONFIGURE_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

CPPFLAGS+=	-I${QT_INCDIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/subcommander2/distinfo (-2 / +2 lines)
1	SHA256 (Subcommander-2.0.0b5p1.tar.gz) = 52820395f76b542e34f5fa6ffb682db8cc9024fc7583e9cbb2d9b078334d7e7c	1	SHA256 (subcommander_2.0.0~b5p2.orig.tar.gz) = d6b346fc4f46779154e1a5903eeca8eb2526eef94a20c533afbea415ba7e16d4
2	SIZE (Subcommander-2.0.0b5p1.tar.gz) = 7279236	2	SIZE (subcommander_2.0.0~b5p2.orig.tar.gz) = 7355565

Lines 1-18 Link Here

(-)devel/subcommander2/files/patch-WcEntry (-18 lines)
1	--- svn/WcEntry.h 2008-11-08 11:23:48.000000000 -0500
2	+++ svn/WcEntry.h 2012-05-11 17:46:20.000000000 -0400
3	@@ -39,5 +39,5 @@
4
5	public:
6	- WcEntry( svn_wc_entry_t* );
7	+ WcEntry(const svn_wc_entry_t*);
8	WcEntry( const WcEntry& src );
9
10	--- svn/WcEntry.cpp 2008-11-08 11:23:48.000000000 -0500
11	+++ svn/WcEntry.cpp 2012-05-11 17:46:01.000000000 -0400
12	@@ -21,5 +21,5 @@
13	}
14
15	-WcEntry::WcEntry( svn_wc_entry_t* entry )
16	+WcEntry::WcEntry(const svn_wc_entry_t* entry)
17	{
18	_name = sc::String(entry->name);




--- configure	2009-09-28 17:29:14.000000000 -0400
+++ configure	2012-05-17 15:32:33.000000000 -0400
@@ -4867,9 +4867,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
 
@@ -4878,7 +4878,7 @@
 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_ra-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_delta-1 -lsvn_diff-1"
   SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1"
@@ -4897,7 +4897,7 @@
 
 fi
 
-if test x$goodsvn == xok; then
+if test x$goodsvn = xok; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
   { echo "$as_me:$LINENO: result:     headers   $SVN_INCLUDES" >&5
@@ -6815,11 +6815,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/"`
 
@@ -6849,7 +6849,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
@@ -6888,11 +6888,6 @@
      QT_INCLUDES="$QT_INCLUDES -I$x_includes"
    fi
 
-   if test x$x_libraries != x; then
-     QT_LIBS="$QT_LIBS -L$x_libraries $X_PRE_LIBS -lX11 -lXext -lXmu -lXt"
-     QT_LIBS="$QT_LIBS -lXi $X_EXTRA_LIBS"
-   fi
-
    ;;
 esac
 




--- 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.hpp>
     ]],
     [[
       boost::shared_ptr<char> ptr;
     ]]
-    ),
+    )],
   [
     AC_MSG_RESULT([yes])
   ],[
@@ -190,10 +191,10 @@
 
 AC_LANG(C++)
 AC_COMPILE_IFELSE(
-  AC_LANG_PROGRAM(
-    [[#include <neon/ne_socket.h>]],
+  [AC_LANG_PROGRAM(
+    [[#error include <neon/ne_socket.h>]],
     [[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 <serf-0/serf.h>]],
+  [AC_LANG_PROGRAM(
+    [[#error include <serf-0/serf.h>]],
     [[
       #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 <openssl/evp.h>
       #include <openssl/err.h>
@@ -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 <db.h>
     ]],
     [[
       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 <QtGui/QWidget>]],
     [[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 <vector>
     ]],
@@ -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])
   ],[




--- 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
 




--- subcommander/Makefile.in.orig	2009-09-20 05:28:23.000000000 -0400
+++ subcommander/Makefile.in	2009-09-20 13:47:04.000000000 -0400
@@ -334,7 +334,7 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-QT_MOC = @QT_BIN@/moc
+QT_MOC = @QT_BIN@/moc-qt4
 scdir = $(datadir)/subcommander
 icondir = $(scdir)/icons/default
 icons = ../pics/icons/default
@@ -450,7 +450,7 @@
 
 AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@
 AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@
-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
 




--- 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;
   }
 

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__CommitItemLvi.cpp (+11 lines)
	1	--- subcommander/CommitItemLvi.cpp.orig 2008-07-13 20:40:21.000000000 +0900
	2	+++ subcommander/CommitItemLvi.cpp 2012-05-10 05:39:57.000000000 +0900
	3	@@ -32,7 +32,7 @@
	4	CommitItemLvi::CommitItemLvi( const svn::CommitItemPtr item,
	5	const QString& itemStr ) : super(), _item(item), _itemStr(itemStr)
	6	{
	7	- char* kinds[] =
	8	+ const char* kinds[] =
	9	{
	10	_n("none"),
	11	_n("file"),




--- 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 )
   {

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__DiffViewModel.cpp (+11 lines)
	1	--- subcommander/DiffViewModel.cpp.orig 2008-12-31 00:58:11.000000000 +0900
	2	+++ subcommander/DiffViewModel.cpp 2012-05-10 05:50:30.000000000 +0900
	3	@@ -78,7 +78,7 @@
	4	{
	5	public:
	6	DiffThread( ScModel* model, DiffViewModel::DiffCmds& cmds )
	7	- : _model(model), _cmds(cmds), _run(true)
	8	+ : _run(true), _model(model), _cmds(cmds)
	9	{
	10	}
	11




--- 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 @@
 "<b>help</b>"
 "<p>"
 "* 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."
 "</p>"
 "<b>internationalization (i18n)</b>"
 "<p>"
@@ -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'."
+"<br>* for anonymous (read only) access to the preconfigured subcommander"
+"  repository, use the username 'guest' with an empty password."
 "</p>"
 "</qt>"
 );

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__MainWindow.cpp (+11 lines)
	1	--- subcommander/MainWindow.cpp.orig 2009-01-11 23:46:56.000000000 +0900
	2	+++ subcommander/MainWindow.cpp 2012-05-10 05:51:23.000000000 +0900
	3	@@ -260,7 +260,7 @@
	4	void MainWindow::settings( const QString& selected )
	5	{
	6	SettingsDialog* sd = new SettingsDialog( _q("subcommander:settings"), this );
	7	- SettingsInfo* si;
	8	+ //SettingsInfo* si;
	9
	10	#if 0
	11	// projects root item




--- 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
 

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__ProjectWizard.cpp (+11 lines)
	1	--- subcommander/ProjectWizard.cpp.orig 2008-11-15 20:42:38.000000000 +0900
	2	+++ subcommander/ProjectWizard.cpp 2012-05-10 05:32:51.000000000 +0900
	3	@@ -363,6 +363,8 @@
	4	sc::String wcPath = sc::String(field("WcPath").toString().utf8());
	5	sc::String wcUrl;
	6
	7	+ if ( wcPath.right(1) == "/" ) wcPath = wcPath.left(wcPath.getByteCnt() - 1);
	8	+
	9	svn::Client::getUrlFromPath( wcPath, wcUrl );
	10
	11	setField( "TrunkUrl", QString::fromUtf8(wcUrl) );

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__RpViewTree.cpp (+11 lines)
	1	--- subcommander/RpViewTree.cpp.orig 2008-08-17 17:00:54.000000000 +0900
	2	+++ subcommander/RpViewTree.cpp 2012-05-10 06:02:40.000000000 +0900
	3	@@ -113,7 +113,7 @@
	4
	5
	6	RpViewTree::RpViewTree( const sc::String& root, RpViewState* state, ActionStorage* as, QWidget* parent )
	7	-: super(parent), _state(state), _actions(as), _itemData(new RpViewEntryData())
	8	+: super(parent), _itemData(new RpViewEntryData()), _state(state), _actions(as)
	9	{
	10	setTextElideMode(Qt::ElideMiddle);
	11	setAllColumnsShowFocus(true);

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__RpViewTreeProxyModel.cpp (+11 lines)
	1	--- subcommander/RpViewTreeProxyModel.cpp.orig 2008-08-09 15:55:24.000000000 +0900
	2	+++ subcommander/RpViewTreeProxyModel.cpp 2012-05-10 05:52:30.000000000 +0900
	3	@@ -28,7 +28,7 @@
	4	{
	5	QVariant value = sourceModel()->data( mapToSource(index), role );
	6
	7	- if( index.column() == 0 && role == Qt::DisplayRole \|\| role == Qt::EditRole )
	8	+ if( (index.column() == 0 && role == Qt::DisplayRole) \|\| role == Qt::EditRole )
	9	{
	10	QString temp = value.toString();
	11

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__RpViewWhatsThis.cpp (+20 lines)
	1	--- subcommander/RpViewWhatsThis.cpp.orig 2007-06-26 04:28:49.000000000 +0900
	2	+++ subcommander/RpViewWhatsThis.cpp 2012-05-10 05:47:04.000000000 +0900
	3	@@ -19,7 +19,7 @@
	4	ws += "<b>" + _q("repository copy view columns") + "</b>";
	5	ws +=
	6	"<hr>"
	7	- "<table cellspacing=0>"
	8	+ "<table cellspacing=2>"
	9	"<tr>";
	10	ws += "<td><nobr>" + _q("name") + "</nobr></td>";
	11	ws += "<td>" + _q("the name of an item - the header shows its name and the repository url") + "<br></td>"
	12	@@ -51,7 +51,7 @@
	13	ws += "<td><nobr>" + _q("last committed date") + "</nobr></td>";
	14	ws += "<td>" + _q("an items last committed date") + "<br></td>" +
	15	"</tr>"
	16	- "<tr>";
	17	+ "<tr>"
	18	"</table>"
	19	"</qt>";
	20




--- 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();
 }
 

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__WcViewTreeProxyModel.cpp (+11 lines)
	1	--- subcommander/WcViewTreeProxyModel.cpp.orig 2009-01-18 18:57:43.000000000 +0900
	2	+++ subcommander/WcViewTreeProxyModel.cpp 2012-05-10 05:44:52.000000000 +0900
	3	@@ -33,7 +33,7 @@
	4	{
	5	QVariant value = sourceModel()->data( mapToSource(index), role );
	6
	7	- if( index.column() == 0 && role == Qt::DisplayRole \|\| role == Qt::EditRole )
	8	+ if( (index.column() == 0 && role == Qt::DisplayRole) \|\| role == Qt::EditRole )
	9	{
	10	QString temp = value.toString();
	11

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__WcViewWhatsThis.cpp (+11 lines)
	1	--- subcommander/WcViewWhatsThis.cpp.orig 2009-01-03 02:33:10.000000000 +0900
	2	+++ subcommander/WcViewWhatsThis.cpp 2012-05-10 05:48:12.000000000 +0900
	3	@@ -162,7 +162,7 @@
	4	"</tr>"
	5	"<tr>";
	6	ws += "<td></td>"
	7	- "<td></td><td>not modified</td><td></td>" "<td>*</td><td>modified</td><td></td>";
	8	+ "<td></td><td>not modified</td><td></td>" "<td>*</td><td>modified</td><td></td>"
	9	"</tr>"
	10	"</table>"
	11	"</qt>";

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__commands__IgnoreCmd.cpp (+11 lines)
	1	--- subcommander/commands/IgnoreCmd.cpp.orig 2008-12-30 23:58:59.000000000 +0900
	2	+++ subcommander/commands/IgnoreCmd.cpp 2012-05-10 05:53:54.000000000 +0900
	3	@@ -30,7 +30,7 @@
	4
	5	void IgnoreCmd::run()
	6	{
	7	- sc::Error* err;
	8	+ sc::Error* err (0);
	9
	10	_prgscb->started( _param, getCancel() );
	11




--- 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) );
 }




--- 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 );




--- 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();

Lines 1-11 Link Here

(-)devel/subcommander2/files/patch-sublib-Makefile.in (-11 lines)
1	--- sublib/Makefile.in.orig 2008-06-22 13:22:05.000000000 -0400
2	+++ sublib/Makefile.in 2008-08-09 09:24:43.000000000 -0400
3	@@ -216,7 +216,7 @@
4	target_alias = @target_alias@
5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@
7	-QT_MOC = @QT_BIN@/moc
8	+QT_MOC = @QT_BIN@/moc-qt4
9	QT_RCC = @QT_BIN@/rcc
10	scdir = $(datadir)/subcommander
11	AM_CPPFLAGS = @APR_CPPFLAGS@ \




--- 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()
 {




--- 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()
 {




--- 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




--- 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 <QtGui/QApplication>
 
+// sys
+#include <cstdlib>
+
 
 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();
   }

Line 0 Link Here

(-)devel/subcommander2/files/patch-sublib__Utility.cpp (+10 lines)
	1	--- sublib/Utility.cpp.orig 2009-09-20 18:10:18.000000000 +0900
	2	+++ sublib/Utility.cpp 2012-05-10 05:31:52.000000000 +0900
	3	@@ -27,6 +27,7 @@
	4	#endif // _WIN32
	5
	6	// sys
	7	+#include <cstdlib>
	8	#include <locale.h>
	9
	10




--- submerge/Makefile.in.orig	2008-06-22 13:22:05.000000000 -0400
+++ submerge/Makefile.in	2008-08-09 09:44:42.000000000 -0400
@@ -221,7 +221,7 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-QT_MOC = @QT_BIN@/moc
+QT_MOC = @QT_BIN@/moc-qt4
 scdir = $(datadir)/subcommander
 icondir = $(scdir)/icons/default
 icon_DATA = ../pics/icons/default/MergeFile-Normal.png \
@@ -245,7 +245,7 @@
 
 AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@
 AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@
-submerge_LDADD = -L../util -L../svn -L../sublib  -lutil -lsvn -lsublib \
+submerge_LDADD = -L../util -L../svn -L../sublib  -lsublib -lutil -lsvn \
                  @QT_LIBS@ @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_diff-1 \
                  -lsvn_subr-1 @STLPORT_LIBS@ -lz
 




--- 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
 

Line 0 Link Here

(-)devel/subcommander2/files/patch-submerge__TextLineNrWidget.cpp (+11 lines)
	1	--- submerge/TextLineNrWidget.cpp.orig 2010-06-20 22:28:45.000000000 +0900
	2	+++ submerge/TextLineNrWidget.cpp 2012-10-02 17:09:22.000000000 +0900
	3	@@ -71,7 +71,7 @@
	4	sc::Size lines = _model->getLineCnt();
	5
	6	char buf[16] = "";
	7	- _lnColumns = sprintf( buf, "%lu", lines );
	8	+ _lnColumns = sprintf( buf, "%lu", static_cast<unsigned long>(lines) );
	9
	10	updateGeometry();
	11	}

Line 0 Link Here

(-)devel/subcommander2/files/patch-svn__VisualMerge.cpp (+11 lines)
	1	--- svn/VisualMerge.cpp.orig 2006-01-18 05:40:34.000000000 +0900
	2	+++ svn/VisualMerge.cpp 2012-05-10 06:01:16.000000000 +0900
	3	@@ -19,7 +19,7 @@
	4
	5	VisualMerge::VisualMerge( svn_client_ctx_t* context, const sc::String& mergeCmd,
	6	apr_pool_t* pool )
	7	-: _context(context), _mergeCmd(mergeCmd), _pool(pool)
	8	+: _context(context), _pool(pool), _mergeCmd(mergeCmd)
	9	{
	10	}
	11

Line 0 Link Here

(-)devel/subcommander2/files/patch-svn__WcEntry.cpp (+11 lines)
	1	--- svn/WcEntry.cpp.orig 2008-11-09 01:23:48.000000000 +0900
	2	+++ svn/WcEntry.cpp 2012-10-02 17:12:20.000000000 +0900
	3	@@ -20,7 +20,7 @@
	4	{
	5	}
	6
	7	-WcEntry::WcEntry( svn_wc_entry_t* entry )
	8	+WcEntry::WcEntry( const svn_wc_entry_t* entry )
	9	{
	10	_name = sc::String(entry->name);
	11	_revision = entry->revision;

Line 0 Link Here

(-)devel/subcommander2/files/patch-svn__WcEntry.h (+11 lines)
	1	--- svn/WcEntry.h.orig 2008-11-09 01:23:48.000000000 +0900
	2	+++ svn/WcEntry.h 2012-10-02 17:12:50.000000000 +0900
	3	@@ -38,7 +38,7 @@
	4	WcEntry();
	5
	6	public:
	7	- WcEntry( svn_wc_entry_t* );
	8	+ WcEntry( const svn_wc_entry_t* );
	9	WcEntry( const WcEntry& src );
	10
	11	Revnumber getRevnumber() const;

Line 0 Link Here

(-)devel/subcommander2/files/patch-util__ErrorCodes.cpp (+11 lines)
	1	--- util/ErrorCodes.cpp.orig 2006-02-13 00:25:44.000000000 +0900
	2	+++ util/ErrorCodes.cpp 2012-05-10 05:46:12.000000000 +0900
	3	@@ -28,7 +28,7 @@
	4	}
	5	}
	6
	7	- return errors[ErrUnknown]._msg;
	8	+ return errors[ErrUnknown - SC_ERR_START]._msg;
	9	}
	10
	11	} // namespace

Return to bug 172504

Lines 2-44 Link Here

(-)devel/subcommander2/Makefile (-24 / +23 lines)
2	# $FreeBSD: ports/devel/subcommander2/Makefile,v 1.32 2012/10/26 10:23:01 bapt Exp $	2	# $FreeBSD: ports/devel/subcommander2/Makefile,v 1.32 2012/10/26 10:23:01 bapt Exp $
3		3
4	PORTNAME= subcommander	4	PORTNAME= subcommander
5	PORTVERSION= 2.0.0.b5	5	PORTVERSION= 2.0.0.b5.2
6	PORTREVISION= 7
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/46766/	7	#MASTER_SITES= http://www.tigris.org/files/documents/1759/47637/
9	DISTNAME= Subcommander-${PORTVERSION:S/.b/b/g}p1	8	MASTER_SITES= DEBIAN
		9	DISTNAME= ${PORTNAME}_${PORTVERSION:R:S,.b,~b,}p${PORTVERSION:E}.orig
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Qt4 based multiplatform subversion client, diff & merge tool	12	COMMENT= Qt4 based multiplatform subversion client, diff & merge tool
13		13
14	DEPRECATED= No more public distfiles	14	LICENSE= GPLv2
15	EXPIRATION_DATE= 2012-11-26
16		15
17	LIB_DEPENDS= neon:${PORTSDIR}/www/neon29 \	16	LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \
18	boost_thread:${PORTSDIR}/devel/boost-libs \	17	svn_client-1:${PORTSDIR}/devel/subversion
19	svn_client-1:${PORTSDIR}/devel/subversion \
20	sasl2:${PORTSDIR}/security/cyrus-sasl2
21		18
22	LATEST_LINK= subcommander2	19	LATEST_LINK= subcommander2
23	CONFLICTS= subcommander-1.*	20	CONFLICTS= subcommander-1.*
24		21
25	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.b/b/g}	22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E}
26	USE_DOS2UNIX= .cpp .h
27		23
28	GNU_CONFIGURE= yes	24	USE_DOS2UNIX= .cpp .h
29	USE_GMAKE= yes	25	USE_QT_VER= 4
		26	QT_COMPONENTS= corelib gui network qt3support moc_build rcc_build uic_build
		27	QT_NONSTANDARD= yes
30	USE_OPENSSL= yes	28	USE_OPENSSL= yes
31	USE_QT4= qt3support gui network corelib moc_build uic_build rcc_build	29	USE_GMAKE= yes
32	CONFIGURE_ARGS+= --with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \	30	USE_AUTOTOOLS= aclocal automake autoheader autoconf
33	--with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \	31	ACLOCAL_ARGS= -I ac-macros
34	--with-apr=${LOCALBASE}/bin/apr-1-config \	32	AUTOMAKE_ARGS= --add-missing --copy --force-missing --foreign
35	--with-apr-util=${LOCALBASE}/bin/apu-1-config \	33	CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include \
36	--with-openssl=${OPENSSLBASE}	34	--with-subversion=${LOCALBASE} --with-qt=${QT_PREFIX} \
37	CPPFLAGS+= -I${LOCALBASE}/include	35	--with-apr=${LOCALBASE}/bin/apr-1-config \
38	LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}	36	--with-apr-util=${LOCALBASE}/bin/apu-1-config \
		37	--with-openssl=${OPENSSLBASE}
39	MAKE_JOBS_SAFE= yes	38	MAKE_JOBS_SAFE= yes
40		39
41	post-extract:	40	CPPFLAGS+= -I${QT_INCDIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
42	@${CHMOD} +x ${WRKSRC}/configure	41	LDFLAGS+= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
43		42
44	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Lines 1-67 Link Here

(-)devel/subcommander2/files/patch-configure (-67 lines)
1	--- configure 2009-09-28 17:29:14.000000000 -0400
2	+++ configure 2012-05-17 15:32:33.000000000 -0400
3	@@ -4867,9 +4867,9 @@
4	goodsvn="bad";
5	elif test $SVN_MAJOR -eq 1 -a $SVN_MINOR -le 3; then
6	goodsvn="bad";
7	-elif test x$SVN_VERSION == x1.4.4; then
8	+elif test x$SVN_VERSION = x1.4.4; then
9	goodsvn="bad";
10	-elif test x$SVN_VERSION == x1.5.0; then
11	+elif test x$SVN_VERSION = x1.5.0; then
12	goodsvn="bad";
13	fi
14
15	@@ -4878,7 +4878,7 @@
16	if test $SVN_MAJOR -ge 1; then
17
18	SVN_LIBS_ALL="$SVN_LIBS -lsvn_client-1 -lsvn_wc-1 -lsvn_repos-1"
19	- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_svn-1 -lsvn_ra_local-1"
20	+ SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_local-1"
21	SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1 -lsvn_fs_fs-1"
22	SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_delta-1 -lsvn_diff-1"
23	SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1"
24	@@ -4897,7 +4897,7 @@
25
26	fi
27
28	-if test x$goodsvn == xok; then
29	+if test x$goodsvn = xok; then
30	{ echo "$as_me:$LINENO: result: yes" >&5
31	echo "${ECHO_T}yes" >&6; }
32	{ echo "$as_me:$LINENO: result: headers $SVN_INCLUDES" >&5
33	@@ -6815,11 +6815,11 @@
34
35	QT_BIN="$qt_path/bin"
36	QT_PATH="$qt_path"
37	- QT_LIBPATH="$qt_path/lib"
38	+ QT_LIBPATH="$qt_path/lib/qt4"
39
40	# extract version numbers of qt
41
42	- QT_VERSION=`$QT_BIN/moc -v 2>&1 \| sed "s/.(Qt \(.\))/\1/"`
43	+ QT_VERSION=`$QT_BIN/moc-qt4 -v 2>&1 \| sed "s/.(Qt \(.\))/\1/"`
44	QT_MAJOR=`echo $QT_VERSION \| sed "s/\(.\)[.].[.].*/\1/"`
45	QT_MINOR=`echo $QT_VERSION \| sed "s/.[.]\(.\)[.].*/\1/"`
46
47	@@ -6849,7 +6849,7 @@
48	*)
49	# any other Unix platform directly link with the libs
50
51	- QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/Qt"
52	+ QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/qt4"
53	QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore"
54	;;
55	esac
56	@@ -6888,11 +6888,6 @@
57	QT_INCLUDES="$QT_INCLUDES -I$x_includes"
58	fi
59
60	- if test x$x_libraries != x; then
61	- QT_LIBS="$QT_LIBS -L$x_libraries $X_PRE_LIBS -lX11 -lXext -lXmu -lXt"
62	- QT_LIBS="$QT_LIBS -lXi $X_EXTRA_LIBS"
63	- fi
64	-
65	;;
66	esac
67

Line 0 Link Here

(-)devel/subcommander2/files/patch-configure.ac (+223 lines)
		1	--- configure.ac.orig 2009-09-29 06:27:22.000000000 +0900
		2	+++ configure.ac 2012-05-10 05:20:28.000000000 +0900
		3	@@ -8,7 +8,8 @@
		4	AM_CONFIG_HEADER(config.h)
		5	AC_CONFIG_SRCDIR(sublib/version.in.h)
		6	AC_CONFIG_AUX_DIR(ac-helpers)
		7	-AM_INIT_AUTOMAKE(subdir-objects)
		8	+AM_INIT_AUTOMAKE(subdir-objects foreign)
		9	+AM_MAINTAINER_MODE
		10	AH_TOP([
		11	#ifndef SC_CONFIG_H
		12	#define SC_CONFIG_H
		13	@@ -141,14 +142,14 @@
		14
		15	AC_LANG(C++)
		16	AC_COMPILE_IFELSE(
		17	- AC_LANG_PROGRAM(
		18	+ [AC_LANG_PROGRAM(
		19	[[
		20	#include <boost/shared_ptr.hpp>
		21	]],
		22	[[
		23	boost::shared_ptr<char> ptr;
		24	]]
		25	- ),
		26	+ )],
		27	[
		28	AC_MSG_RESULT([yes])
		29	],[
		30	@@ -190,10 +191,10 @@
		31
		32	AC_LANG(C++)
		33	AC_COMPILE_IFELSE(
		34	- AC_LANG_PROGRAM(
		35	- [[#include <neon/ne_socket.h>]],
		36	+ [AC_LANG_PROGRAM(
		37	+ [[#error include <neon/ne_socket.h>]],
		38	[[ne_sock_exit()]]
		39	- ),
		40	+ )],
		41	[
		42	AC_MSG_RESULT([yes])
		43	AC_MSG_RESULT([ headers $NEON_INCLUDES])
		44	@@ -241,14 +242,14 @@
		45
		46	AC_LANG(C++)
		47	AC_COMPILE_IFELSE(
		48	- AC_LANG_PROGRAM(
		49	- [[#include <serf-0/serf.h>]],
		50	+ [AC_LANG_PROGRAM(
		51	+ [[#error include <serf-0/serf.h>]],
		52	[[
		53	#if ! SERF_VERSION_AT_LEAST(0,3,0)
		54	# error no serf!
		55	#endif // serf
		56	]]
		57	- ),
		58	+ )],
		59	[
		60	AC_MSG_RESULT([yes])
		61	AC_MSG_RESULT([ headers $SERF_INCLUDES])
		62	@@ -273,9 +274,9 @@
		63	AC_SUBST(NET_LIBS)
		64
65
66	-if test x$found_neon = xno -a x$found_serf = xno; then
67	- AC_MSG_ERROR([found neither neon nor serf, try setting --with-neon or --with-serf])
68	-fi
69	+#if test x$found_neon = xno -a x$found_serf = xno; then
70	+# AC_MSG_ERROR([found neither neon nor serf, try setting --with-neon or --with-serf])
71	+#fi
72
73
74	##
75	@@ -357,9 +358,9 @@
76	goodsvn="bad";
77	elif test $SVN_MAJOR -eq 1 -a $SVN_MINOR -le 3; then
78	goodsvn="bad";
79	-elif test x$SVN_VERSION == x1.4.4; then
80	+elif test x$SVN_VERSION = x1.4.4; then
81	goodsvn="bad";
82	-elif test x$SVN_VERSION == x1.5.0; then
83	+elif test x$SVN_VERSION = x1.5.0; then
84	goodsvn="bad";
85	fi
86
87	@@ -368,26 +369,14 @@
88	if test $SVN_MAJOR -ge 1; then
89
90	SVN_LIBS_ALL="$SVN_LIBS -lsvn_client-1 -lsvn_wc-1 -lsvn_repos-1"
91	- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_svn-1 -lsvn_ra_local-1"
92	- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1 -lsvn_fs_fs-1"
93	+ SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1"
94	+ SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1"
95	SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_delta-1 -lsvn_diff-1"
96	SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1"
97
98	- if test $SVN_MINOR -eq 4; then
99	- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_dav-1"
100	- elif test $SVN_MINOR -ge 5; then
101	- if test x$found_neon = xyes; then
102	- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_neon-1"
103	- fi
104	- if test x$found_serf = xyes; then
105	- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_serf-1"
106	- fi
107	- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs_util-1"
108	- fi
109	-
110	fi
111
112	-if test x$goodsvn == xok; then
113	+if test x$goodsvn = xok; then
114	AC_MSG_RESULT([yes])
115	AC_MSG_RESULT([ headers $SVN_INCLUDES])
116	AC_MSG_RESULT([ libraries $SVN_LIBS_ALL])
117	@@ -443,7 +432,7 @@
118
119	AC_LANG(C++)
120	AC_COMPILE_IFELSE(
121	- AC_LANG_PROGRAM(
122	+ [AC_LANG_PROGRAM(
123	[[
124	#include <openssl/evp.h>
125	#include <openssl/err.h>
126	@@ -454,7 +443,7 @@
127	ERR_free_strings();
128	unsigned long openssl = OPENSSL_VERSION_NUMBER;
129	]]
130	- ),
131	+ )],
132	[
133	AC_MSG_RESULT([yes])
134	],[
135	@@ -500,14 +489,14 @@
136
137	AC_LANG(C++)
138	AC_COMPILE_IFELSE(
139	- AC_LANG_PROGRAM(
140	+ [AC_LANG_PROGRAM(
141	[[
142	#include <db.h>
143	]],
144	[[
145	unsigned long num = DB_VERSION_MAJOR;
146	]]
147	- ),
148	+ )],
149	[
150	AC_MSG_RESULT([yes])
151	AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db])
152	@@ -635,11 +624,11 @@
153
154	QT_BIN="$qt_path/bin"
155	QT_PATH="$qt_path"
156	- QT_LIBPATH="$qt_path/lib"
157	+ QT_LIBPATH="$qt_path/lib/qt4"
158
159	# extract version numbers of qt
160
161	- QT_VERSION=`$QT_BIN/moc -v 2>&1 \| sed "s/.(Qt \(.\))/\1/"`
162	+ QT_VERSION=`$QT_BIN/moc-qt4 -v 2>&1 \| sed "s/.(Qt \(.\))/\1/"`
163	QT_MAJOR=`echo $QT_VERSION \| sed "s/\(.\)[[.]].[[.]].*/\1/"`
164	QT_MINOR=`echo $QT_VERSION \| sed "s/.[[.]]\(.\)[[.]].*/\1/"`
165
166	@@ -669,7 +658,7 @@
167	*)
168	# any other Unix platform directly link with the libs
169
170	- QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/Qt"
171	+ QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/qt4"
172	QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore"
173	;;
174	esac
175	@@ -719,10 +708,10 @@
176
177	AC_LANG(C++)
178	AC_COMPILE_IFELSE(
179	- AC_LANG_PROGRAM(
180	+ [AC_LANG_PROGRAM(
181	[[#include <QtGui/QWidget>]],
182	[[QWidget* w = new QWidget();]]
183	- ),
184	+ )],
185	[
186	AC_MSG_RESULT([yes])
187	AC_MSG_RESULT([ version $QT_VERSION])
188	@@ -816,7 +805,7 @@
189
190	AC_LANG(C++)
191	AC_COMPILE_IFELSE(
192	- AC_LANG_PROGRAM(
193	+ [AC_LANG_PROGRAM(
194	[[
195	#include <vector>
196	]],
197	@@ -825,7 +814,7 @@
198	#error no stlport!
199	#endif // _STLPORT_VERSION
200	]]
201	- ),
202	+ )],
203	[
204	AC_MSG_RESULT([yes])
205	has_stlport="yes"
206	@@ -853,7 +842,7 @@
207	AC_MSG_CHECKING([wether we have a working stl])
208	AC_LANG(C++)
209	AC_COMPILE_IFELSE(
210	- AC_LANG_PROGRAM(
211	+ [AC_LANG_PROGRAM(
212	[[
213	]],
214	[[
215	@@ -861,7 +850,7 @@
216	# error needs stlport!
217	#endif // __GNUC__
218	]]
219	- ),
220	+ )],
221	[
222	AC_MSG_RESULT([yes])
223	],[

Line 0 Link Here

(-)devel/subcommander2/files/patch-po__Makefile.am (+16 lines)
	1	--- po/Makefile.am.orig 2009-05-17 22:56:55.000000000 +0900
	2	+++ po/Makefile.am 2012-05-10 05:36:32.000000000 +0900
	3	@@ -1,11 +1,12 @@
	4	## process this file with automake to produce Makefile.in
	5
	6	-locdir=$(datadir)/locale
	7	+locdir=$(DESTDIR)/$(datadir)/locale
	8
	9	all: po-merge de.mo zh_CN.mo
	10
	11
	12	install-data-local:
	13	+ mkdir -p $(locdir)/de/LC_MESSAGES/ $(locdir)/zh_CN/LC_MESSAGES/
	14	cp de.mo $(locdir)/de/LC_MESSAGES/Subcommander.mo
	15	cp zh_CN.mo $(locdir)/zh_CN/LC_MESSAGES/Subcommander.mo
	16

Lines 1-20 Link Here

(-)devel/subcommander2/files/patch-subcommander-Makefile.in (-20 lines)
1	--- subcommander/Makefile.in.orig 2009-09-20 05:28:23.000000000 -0400
2	+++ subcommander/Makefile.in 2009-09-20 13:47:04.000000000 -0400
3	@@ -334,7 +334,7 @@
4	target_alias = @target_alias@
5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@
7	-QT_MOC = @QT_BIN@/moc
8	+QT_MOC = @QT_BIN@/moc-qt4
9	scdir = $(datadir)/subcommander
10	icondir = $(scdir)/icons/default
11	icons = ../pics/icons/default
12	@@ -450,7 +450,7 @@
13
14	AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@
15	AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@
16	-subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib \
17	+subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lsublib -lutil \
18	@QT_LIBS@ @SVN_LIBS_ALL@ @STLPORT_LIBS@ @NET_LIBS@ \
19	@APU_LIBS@ @APR_LIBS@ -lsasl2 -lz
20

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__BookmarkViewItemModel.cpp (+12 lines)
	1	--- subcommander/BookmarkViewItemModel.cpp.orig 2009-09-20 18:24:16.000000000 +0900
	2	+++ subcommander/BookmarkViewItemModel.cpp 2012-05-10 05:38:50.000000000 +0900
	3	@@ -219,7 +219,8 @@
	4	if( !advance )
	5	return false;
	6
	7	- _frame = ++_frame % ActiveDecorationFrames;
	8	+ ++_frame;
	9	+ _frame = _frame % ActiveDecorationFrames;
	10	return true;
	11	}
	12

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__DiffSummarizeLvi.cpp (+20 lines)
	1	--- subcommander/DiffSummarizeLvi.cpp.orig 2007-08-04 16:22:10.000000000 +0900
	2	+++ subcommander/DiffSummarizeLvi.cpp 2012-05-10 05:41:05.000000000 +0900
	3	@@ -13,7 +13,7 @@
	4	#include "svn/DiffSummarize.h"
	5
	6
	7	-static char* getSummarizeCode( svn::DiffSummarizeKind kind )
	8	+static char* const getSummarizeCode( svn::DiffSummarizeKind kind )
	9	{
	10	switch( kind )
	11	{
	12	@@ -25,7 +25,7 @@
	13	}
	14	}
	15
	16	-static char* getNodCode( svn::NodeKind kind )
	17	+static char* const getNodCode( svn::NodeKind kind )
	18	{
	19	switch( kind )
	20	{

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__ListWidget.cpp (+20 lines)
	1	--- subcommander/ListWidget.cpp.orig 2009-09-13 01:49:22.000000000 +0900
	2	+++ subcommander/ListWidget.cpp 2012-05-10 06:04:40.000000000 +0900
	3	@@ -134,7 +134,7 @@
	4	"<b>help</b>"
	5	"<p>"
	6	"* pressing SHIFT-F1 in the working copy view will display a detailed"
	7	-"description of the the columns and their possible values."
	8	+" description of the the columns and their possible values."
	9	"</p>"
	10	"<b>internationalization (i18n)</b>"
	11	"<p>"
	12	@@ -151,6 +151,8 @@
	13	"set any repository folder as branch or tag folder. subcommander needs"
	14	" only to know WHERE you keep your branches and tags. It does NOT "
	15	"require that they are named 'branches' or 'tags'."
	16	+"<br>* for anonymous (read only) access to the preconfigured subcommander"
	17	+" repository, use the username 'guest' with an empty password."
	18	"</p>"
	19	"</qt>"
	20	);

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__Makefile.am (+23 lines)
	1	--- subcommander/Makefile.am.orig 2009-09-20 18:10:18.000000000 +0900
	2	+++ subcommander/Makefile.am 2012-05-10 05:35:09.000000000 +0900
	3	@@ -1,7 +1,7 @@
	4	## process this file with automake to produce Makefile.in
	5
	6
	7	-QT_MOC = @QT_BIN@/moc
	8	+QT_MOC = @QT_BIN@/moc-qt4
	9
	10	scdir = $(datadir)/subcommander
	11	icondir = $(scdir)/icons/default
	12	@@ -125,9 +125,9 @@
	13
	14	bin_PROGRAMS = subcommander
	15
	16	-subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib \
	17	+subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lsublib -lutil \
	18	@QT_LIBS@ @SVN_LIBS_ALL@ @STLPORT_LIBS@ @NET_LIBS@ \
	19	- @APU_LIBS@ @APR_LIBS@ -lsasl2 -lz
	20	+ @APU_LIBS@ @APR_LIBS@ -lz
	21
	22	subcommander_DEPENDENCIES = ../sublib/libsublib.a ../svn/libsvn.a ../util/libutil.a
	23

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__WcSelection.cpp (+13 lines)
	1	--- subcommander/WcSelection.cpp.orig 2007-09-16 23:37:07.000000000 +0900
	2	+++ subcommander/WcSelection.cpp 2012-05-10 05:43:53.000000000 +0900
	3	@@ -89,8 +89,8 @@
	4
	5	svn::WcStatusPtr status = *(_statuss.begin());
	6
	7	- return !status->isAddable()
	8	- && status->isChanged()
	9	+ return (!status->isAddable()
	10	+ && status->isChanged())
	11	\|\| status->isDir();
	12	}
	13

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__commands__ScCmd.cpp (+18 lines)
	1	--- subcommander/commands/ScCmd.cpp.orig 2008-11-23 01:46:19.000000000 +0900
	2	+++ subcommander/commands/ScCmd.cpp 2012-05-10 05:55:05.000000000 +0900
	3	@@ -28,13 +28,13 @@
	4	_client = client;
	5	_prgscb = progress;
	6
	7	- apr_time_t t1 = apr_time_now();
	8	+ //apr_time_t t1 = apr_time_now();
	9
	10	//_prgscb->started( getId(), /_param/, getCancel() );
	11	run();
	12	//_prgscb->finished( getId(), /_param/, time );
	13
	14	- apr_time_t t2 = apr_time_now();
	15	+ //apr_time_t t2 = apr_time_now();
	16
	17	//_prgscb->time( _id, ((double)(t2-t1)/1000.0) );
	18	}

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp (+20 lines)
	1	--- subcommander/settings/ToolsSettingsWidget.cpp.orig 2007-08-19 22:04:03.000000000 +0900
	2	+++ subcommander/settings/ToolsSettingsWidget.cpp 2012-05-10 05:29:12.000000000 +0900
	3	@@ -39,7 +39,7 @@
	4	vl->addStretch(1);
	5	{
	6	// diff command
	7	- QLabel* diffLabel = new QLabel(_q("(visual) diff comand:"), this);
	8	+ QLabel* diffLabel = new QLabel(_q("(visual) diff command:"), this);
	9	QPushButton* diffBi = new QPushButton( _q("reset/builtin"), this );
	10	_diffEdit = new QLineEdit( this );
	11	QPushButton* diffEx = new ExternButton( this );
	12	@@ -59,7 +59,7 @@
	13	row++;
	14
	15	// merge command
	16	- QLabel* mergeLabel = new QLabel(_q("(visual) merge comand:"), this);
	17	+ QLabel* mergeLabel = new QLabel(_q("(visual) merge command:"), this);
	18	QPushButton* mergeBi = new QPushButton( _q("reset/builtin"), this );
	19	_mergeEdit = new QLineEdit( this );
	20	QPushButton* mergeEx = new ExternButton( this );

Line 0 Link Here

(-)devel/subcommander2/files/patch-subcommander__subcommander.cpp (+32 lines)
	1	--- subcommander/subcommander.cpp.orig 2009-09-20 18:10:18.000000000 +0900
	2	+++ subcommander/subcommander.cpp 2012-05-10 06:03:26.000000000 +0900
	3	@@ -64,12 +64,6 @@
	4	#endif // _WIN32
	5	}
	6
	7	-void exit_neon()
	8	-{
	9	-#ifdef _WIN32
	10	- ne_sock_exit();
	11	-#endif // _WIN32
	12	-}
	13
	14
	15	/** main for running the tests. */
	16	@@ -123,7 +117,7 @@
	17	// no way to bring up a dialog if something went wrong in the basic
	18	// initialization.
	19
	20	- fprintf( stderr, e.getError()->getMessage() );
	21	+ fprintf( stderr, "%s", e.getError()->getMessage() );
	22	return EXIT_FAILURE;
	23	}
	24
	25	@@ -167,7 +161,6 @@
	26	//config.save();
	27
	28	exit_ssl();
	29	- exit_neon();
	30
	31	TargetRepository::teardown();
	32	stopStackProcess();

Line 0 Link Here

(-)devel/subcommander2/files/patch-sublib__CrashHandler.cpp (+18 lines)
	1	--- sublib/CrashHandler.cpp.orig 2007-08-19 22:04:03.000000000 +0900
	2	+++ sublib/CrashHandler.cpp 2012-05-10 05:56:28.000000000 +0900
	3	@@ -22,6 +22,7 @@
	4	#endif // _WIN32
	5
	6
	7	+#if _WIN32
	8	// helper
	9	static const char* copyString( const sc::String& src )
	10	{
	11	@@ -37,6 +38,7 @@
	12	QString sbj = _q("%1 [%2] crashed...").arg(getLongAppName()).arg(SUBCOMMANDER_VERSION);
	13	return sc::String(sbj.toUtf8());
	14	}
	15	+#endif
	16
	17	static sc::String getMessage()
	18	{

Line 0 Link Here

(-)devel/subcommander2/files/patch-sublib__ErrorDialog.cpp (+18 lines)
	1	--- sublib/ErrorDialog.cpp.orig 2007-08-19 22:04:03.000000000 +0900
	2	+++ sublib/ErrorDialog.cpp 2012-05-10 05:49:27.000000000 +0900
	3	@@ -219,6 +219,7 @@
	4	{
	5	}
	6
	7	+#if _WIN32
	8	static const char* copyString( const QString& s )
	9	{
	10	QByteArray qs = s.toLocal8Bit();
	11	@@ -226,6 +227,7 @@
	12	strncpy( result, (const char*)qs, qs.length() );
	13	return result;
	14	}
	15	+#endif
	16
	17	void ErrorDialog::send()
	18	{

Line 0 Link Here

(-)devel/subcommander2/files/patch-sublib__Makefile.am (+19 lines)
	1	--- sublib/Makefile.am.orig 2009-09-20 18:10:18.000000000 +0900
	2	+++ sublib/Makefile.am 2012-05-10 05:23:34.000000000 +0900
	3	@@ -1,6 +1,6 @@
	4	## process this file with automake to produce Makefile.in
	5
	6	-QT_MOC = @QT_BIN@/moc
	7	+QT_MOC = @QT_BIN@/moc-qt4
	8	QT_RCC = @QT_BIN@/rcc
	9
	10	scdir = $(datadir)/subcommander
	11	@@ -121,7 +121,7 @@
	12	$(QT_MOC) $< -o $@
	13
	14	resources.cpp : resources.h
	15	- $(QT_RCC) -name sublib -o $@ ../pics/sublib.qrc
	16	+ $(QT_RCC) -name sublib -o $@ $(top_srcdir)/pics/sublib.qrc
	17
	18	clean-local:
	19	-rm -rf moc

Line 0 Link Here

(-)devel/subcommander2/files/patch-sublib__MsgHandler.cpp (+20 lines)
	1	--- sublib/MsgHandler.cpp.orig 2007-08-19 22:04:03.000000000 +0900
	2	+++ sublib/MsgHandler.cpp 2012-05-10 05:58:52.000000000 +0900
	3	@@ -16,6 +16,9 @@
	4	// qt
	5	#include <QtGui/QApplication>
	6
	7	+// sys
	8	+#include <cstdlib>
	9	+
	10
	11	static void MessageHandler( QtMsgType type, const char *msg )
	12	{
	13	@@ -28,6 +31,7 @@
	14	msgWarning( getLongAppName(), msg, _q("&Ok") );
	15	break;
	16	case QtFatalMsg:
	17	+ case QtCriticalMsg:
	18	msgCritical( getLongAppName(), msg, _q("&Abort") );
	19	abort();
	20	}

Lines 1-20 Link Here

(-)devel/subcommander2/files/patch-submerge-Makefile.in (-20 lines)
1	--- submerge/Makefile.in.orig 2008-06-22 13:22:05.000000000 -0400
2	+++ submerge/Makefile.in 2008-08-09 09:44:42.000000000 -0400
3	@@ -221,7 +221,7 @@
4	target_alias = @target_alias@
5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@
7	-QT_MOC = @QT_BIN@/moc
8	+QT_MOC = @QT_BIN@/moc-qt4
9	scdir = $(datadir)/subcommander
10	icondir = $(scdir)/icons/default
11	icon_DATA = ../pics/icons/default/MergeFile-Normal.png \
12	@@ -245,7 +245,7 @@
13
14	AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@
15	AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@
16	-submerge_LDADD = -L../util -L../svn -L../sublib -lutil -lsvn -lsublib \
17	+submerge_LDADD = -L../util -L../svn -L../sublib -lsublib -lutil -lsvn \
18	@QT_LIBS@ @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_diff-1 \
19	-lsvn_subr-1 @STLPORT_LIBS@ -lz
20

Line 0 Link Here

(-)devel/subcommander2/files/patch-submerge__Makefile.am (+20 lines)
	1	--- submerge/Makefile.am.orig 2008-06-23 02:19:21.000000000 +0900
	2	+++ submerge/Makefile.am 2012-05-10 05:28:09.000000000 +0900
	3	@@ -1,7 +1,7 @@
	4	## process this file with automake to produce Makefile.in
	5
	6
	7	-QT_MOC = @QT_BIN@/moc
	8	+QT_MOC = @QT_BIN@/moc-qt4
	9
	10	scdir = $(datadir)/subcommander
	11	icondir = $(scdir)/icons/default
	12	@@ -29,7 +29,7 @@
	13
	14	bin_PROGRAMS = submerge
	15
	16	-submerge_LDADD = -L../util -L../svn -L../sublib -lutil -lsvn -lsublib \
	17	+submerge_LDADD = -L../util -L../svn -L../sublib -lutil -lsublib -lsvn \
	18	@QT_LIBS@ @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_diff-1 \
	19	-lsvn_subr-1 @STLPORT_LIBS@ -lz
	20