diff options
Diffstat (limited to 'devel/subcommander2/files')
4 files changed, 1 insertions, 32 deletions
diff --git a/devel/subcommander2/files/patch-configure.ac b/devel/subcommander2/files/patch-configure.ac index b3839f6857de..1face02b85a5 100644 --- a/devel/subcommander2/files/patch-configure.ac +++ b/devel/subcommander2/files/patch-configure.ac @@ -149,7 +149,7 @@ [ AC_MSG_RESULT([yes]) AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db]) -@@ -635,11 +624,11 @@ +@@ -635,7 +624,7 @@ QT_BIN="$qt_path/bin" QT_PATH="$qt_path" @@ -158,11 +158,6 @@ # 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 diff --git a/devel/subcommander2/files/patch-subcommander__Makefile.am b/devel/subcommander2/files/patch-subcommander__Makefile.am index ff0284b4d16a..1d2d4e097b1c 100644 --- a/devel/subcommander2/files/patch-subcommander__Makefile.am +++ b/devel/subcommander2/files/patch-subcommander__Makefile.am @@ -1,14 +1,5 @@ --- 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 diff --git a/devel/subcommander2/files/patch-sublib__Makefile.am b/devel/subcommander2/files/patch-sublib__Makefile.am index fa5ae9128168..ff7bc00ffad9 100644 --- a/devel/subcommander2/files/patch-sublib__Makefile.am +++ b/devel/subcommander2/files/patch-sublib__Makefile.am @@ -1,13 +1,5 @@ --- 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 $@ diff --git a/devel/subcommander2/files/patch-submerge__Makefile.am b/devel/subcommander2/files/patch-submerge__Makefile.am index a2c0159fe16b..6766a98420c1 100644 --- a/devel/subcommander2/files/patch-submerge__Makefile.am +++ b/devel/subcommander2/files/patch-submerge__Makefile.am @@ -1,14 +1,5 @@ --- 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 |