Author: ranger Date: Fri Oct 12 04:51:57 2007 New Revision: 1005 URL: http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1005&repname=user%3a+ranger Log: fix include dir
Modified: trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch Modified: trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch&rev=1005&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch (original) +++ trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch Fri Oct 12 04:51:57 2007 @@ -129,7 +129,7 @@ +popd +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" --- qt-copy/mkspecs/darwin-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:37:35.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:43:55.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -158,7 +158,7 @@ QMAKE_CXX = c++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -@@ -38,7 +41,10 @@ +@@ -38,9 +41,12 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC @@ -167,8 +167,11 @@ +QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - QMAKE_INCDIR = /usr/local/include +-QMAKE_INCDIR = /usr/local/include ++QMAKE_INCDIR = QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = /usr/X11R6/include + QMAKE_LIBDIR_X11 = /usr/X11R6/lib @@ -51,17 +57,21 @@ QMAKE_LINK = c++ Modified: trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch&rev=1005&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch (original) +++ trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch Fri Oct 12 04:51:57 2007 @@ -129,7 +129,7 @@ +popd +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" --- qt-copy/mkspecs/darwin-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:37:35.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:43:55.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -158,7 +158,7 @@ QMAKE_CXX = c++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -@@ -38,7 +41,10 @@ +@@ -38,9 +41,12 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC @@ -167,8 +167,11 @@ +QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - QMAKE_INCDIR = /usr/local/include +-QMAKE_INCDIR = /usr/local/include ++QMAKE_INCDIR = QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = /usr/X11R6/include + QMAKE_LIBDIR_X11 = /usr/X11R6/lib @@ -51,17 +57,21 @@ QMAKE_LINK = c++ Modified: trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch&rev=1005&repname=user%3a+ranger ============================================================================== --- trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch (original) +++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch Fri Oct 12 04:51:57 2007 @@ -135,7 +135,7 @@ +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" diff -uNr qt-copy/mkspecs/darwin-g++/qmake.conf qt-copy-new/mkspecs/darwin-g++/qmake.conf --- qt-copy/mkspecs/darwin-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:37:35.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:43:55.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -164,7 +164,7 @@ QMAKE_CXX = c++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -@@ -38,7 +41,10 @@ +@@ -38,9 +41,12 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC @@ -173,8 +173,11 @@ +QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - QMAKE_INCDIR = /usr/local/include +-QMAKE_INCDIR = /usr/local/include ++QMAKE_INCDIR = QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = /usr/X11R6/include + QMAKE_LIBDIR_X11 = /usr/X11R6/lib @@ -51,17 +57,21 @@ QMAKE_LINK = c++ ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits