[36982] trunk/dports/x11/qt4-x11
mcalhoun at macports.org
mcalhoun at macports.org
Wed May 21 17:20:55 PDT 2008
Revision: 36982
http://trac.macosforge.org/projects/macports/changeset/36982
Author: mcalhoun at macports.org
Date: 2008-05-21 17:20:53 -0700 (Wed, 21 May 2008)
Log Message:
-----------
Upgraded to 4.4.0.
Removed plethora of variants.
Modified Paths:
--------------
trunk/dports/x11/qt4-x11/Portfile
trunk/dports/x11/qt4-x11/files/patch-q3process_unix.cpp.diff
trunk/dports/x11/qt4-x11/files/patch-qlibrary_unix.cpp.diff
trunk/dports/x11/qt4-x11/files/patch-qprocess_unix.cpp.diff
Removed Paths:
-------------
trunk/dports/x11/qt4-x11/files/patch-Makefile.unix.diff
trunk/dports/x11/qt4-x11/files/patch-qmake.conf.diff
Modified: trunk/dports/x11/qt4-x11/Portfile
===================================================================
--- trunk/dports/x11/qt4-x11/Portfile 2008-05-21 22:44:10 UTC (rev 36981)
+++ trunk/dports/x11/qt4-x11/Portfile 2008-05-22 00:20:53 UTC (rev 36982)
@@ -4,8 +4,8 @@
PortSystem 1.0
name qt4-x11
-version 4.3.4
-categories x11
+version 4.4.0
+categories x11
maintainers mcalhoun
homepage http://www.trolltech.com/
platforms darwin
@@ -16,83 +16,141 @@
http://ftp.ntua.gr/pub/X11/Qt/qt/source/ \
http://wftp.tu-chemnitz.de/pub/Qt/qt/source/
distname qt-x11-opensource-src-${version}
-checksums \
- md5 9499101ec54eb7b0de195b3c5e3ffa93 \
- sha1 639f6469d5aa07c51c2aa6795f8e3de3aab8cd25 \
- rmd160 eb081e599e61bcaa126981aecbe2db480be35eca
+checksums \
+ md5 f13ad0aa75efad314715930e663bad55 \
+ sha1 f5e5cae003e2fb18eba147686b07f03078ef185e \
+ rmd160 7006f672c4ea9985ace6c57bbb1f710a1e444c7f
+depends_lib \
+ port:zlib \
+ port:libungif \
+ port:tiff \
+ port:libpng \
+ port:libmng \
+ port:jpeg \
+ port:libiconv \
+ port:glib2 \
+ port:dbus \
+ port:unixODBC \
+ port:mysql5 \
+ port:sqlite3 \
+ port:openssl \
+ port:fontconfig \
+ port:gettext
-depends_lib port:libmng port:libpng port:jpeg port:tiff port:libiconv
+configure.cmd "echo yes | ./configure"
+configure.env OPENSOURCE_CXXFLAGS=-D__USE_WS_X11__
-# have to build with Apple gcc because of -fconstant-cfstrings
-configure.compiler gcc-4.0
-configure.cmd "echo yes | ./configure"
+# --prefix is not recognized
configure.pre_args
-configure.args \
- -v \
- -prefix '${prefix}' \
- -docdir '${prefix}/share/doc/${portname}' \
- -datadir '${prefix}/share/${portname}' \
- -headerdir '${prefix}/include/${portname}' \
- -plugindir '${prefix}/lib/${portname}-plugins' \
- -translationdir '${prefix}/share/${portname}/translations' \
- -optimized-qmake -release -shared -stl \
- -no-openssl -largefile \
- -system-libpng -system-libjpeg -system-libmng -system-libtiff \
- -system-zlib -qt-gif \
- -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \
- -no-sql-sqlite -no-nis -no-cups \
- -make libs -make tools \
- -I${worksrcpath}/include -I${prefix}/include \
- -L${worksrcpath}/lib -L${prefix}/lib -lresolv \
- -no-rpath
+# -I and -L must be set in the configure script
+# (or else a few generated Makefiles will not seem them).
+configure.cppflags
+configure.ldflags
+configure.args \
+ -v \
+ -prefix ${prefix} \
+ -docdir ${prefix}/share/doc/${portname} \
+ -headerdir ${prefix}/include/${portname} \
+ -plugindir ${prefix}/lib/${portname}-plugins \
+ -datadir ${prefix}/share/${portname} \
+ -translationdir ${prefix}/share/${portname}/translations \
+ -examplesdir ${prefix}/share/${portname}/examples \
+ -demosdir ${prefix}/share/${portname}/demos \
+ -system-sqlite \
+ -I${prefix}/include \
+ -I${prefix}/include/mysql5/mysql \
+ -L${prefix}/lib \
+ -L${prefix}/lib/mysql5/mysql \
+ -liconv \
+ -lresolv \
+ -no-rpath \
+ -no-nas-sound
+
build.target first
+use_parallel_build yes
destroot.destdir INSTALL_ROOT="${destroot}"
patchfiles \
- patch-Makefile.unix.diff patch-qlibrary_unix.cpp.diff patch-q3process_unix.cpp.diff \
- patch-qprocess_unix.cpp.diff patch-qmake.conf.diff
+ patch-qprocess_unix.cpp.diff \
+ patch-qlibrary_unix.cpp.diff \
+ patch-q3process_unix.cpp.diff
+platform darwin 7 {
+ depends_build-append port:cups-headers
+}
+
+platform darwin 9 {
+ # See http://trac.macports.org/wiki/LeopardProblems
+ post-patch {
+ set dylibFile \
+ /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ reinplace -E \
+ "s|^(QMAKE_LFLAGS\[ \t\]*=\[ \t\]*)|\\1 -Wl,-dylib_file,${dylibFile}:${dylibFile}|g" \
+ ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+ }
+}
+
+post-configure {
+ # Assures local header is included instead of one from PCRE and OpenJPEG (and perhaps others).
+ reinplace "s|\$(CFLAGS) \$(INCPATH)|\$(INCPATH) \$(CFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile
+ reinplace "s|\$(CXXFLAGS) \$(INCPATH)|\$(INCPATH) \$(CXXFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile
+}
+
post-patch {
reinplace "s|ARCH=macosx|ARCH=`uname -p`|g" ${worksrcpath}/configure
+ reinplace "s|/usr/X11R6/include|${x11prefix}/include|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+ reinplace "s|/usr/X11R6/lib|${x11prefix}/lib|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+ reinplace \
+ "s|install_name\$\${LITERAL_WHITESPACE}|install_name\$\${LITERAL_WHITESPACE}\$\$\[QT_INSTALL_LIBS\]/|g" \
+ ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
reinplace "s|Q_OS_DARWIN|Q_WS_MAC|g" ${worksrcpath}/qmake/generators/mac/pbuilder_pbx.cpp
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/demos/qtdemo/colors.cpp
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/dialogs/standarddialogs/dialog.cpp
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/tools/plugandpaint/mainwindow.cpp
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/qmake/main.cpp
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/codecs/qiconvcodec.cpp
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/codecs/qiconvcodec_p.h
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/tools/qstring.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/global/qglobal.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qfsfileengine_unix.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/global/qlibraryinfo.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/tools/qlocale.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qsettings_p.h
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qsettings.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/qmake/option.cpp
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qsettings_p.h
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/plugin/qlibrary.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/kernel/qcoreapplication.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/thread/qthread_unix.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/dialogs/qprintdialog.h
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/demos/mediaplayer/mediaplayer.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/demos/qtdemo/colors.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/demos/qtdemo/menumanager.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/dialogs/standarddialogs/dialog.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/help/remotecontrol/remotecontrol.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/help/simpletextviewer/assistant.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/tools/echoplugin/echowindow/echowindow.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/tools/plugandpaint/mainwindow.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/codecs/qiconvcodec.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/codecs/qiconvcodec_p.h
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qdir.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/kernel/qcoreapplication_p.h
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/tools/qpoint.h
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/tools/qrect.h
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/dialogs/qprintdialog.h
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/kernel/qapplication.h
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/kernel/qapplication_p.h
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/widgets/qdockwidget.cpp
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/thread/qthread_unix.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/text/qfont.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/text/qfontdatabase.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/widgets/qdockwidget.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/plugins/accessible/widgets/simplewidgets.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/qt3support/other/q3accel.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/qt3support/other/q3polygonscanner.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/qt3support/text/q3textedit.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/sql/drivers/odbc/qsql_odbc.h
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/tools/uic/cpp/cppwriteinitialization.cpp
+ reinplace "s|(Q_OS_MAC)|(Q_WS_MAC)|g" ${worksrcpath}/src/tools/uic/cpp/cppwriteinitialization.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/tools/uic/cpp/cppwriteinitialization.h
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/tools/uic/cpp/cppwriteinitialization.h
- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/assistant/lib/qassistantclient.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/assistant/compat/lib/qassistantclient.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/assistant/lib/qhelpsearchresultwidget.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/designer/src/designer/assistantclient.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/designer/src/designer/qdesigner_actions.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/linguist/linguist/trwindow.cpp
reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/linguist/shared/proparserutils.h
+ reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/shared/findwidget/findwidget.cpp
}
post-destroot {
@@ -100,59 +158,8 @@
GPL_EXCEPTION_ADDENDUM.TXT GPL_EXCEPTION.TXT} {
xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${portname}
}
- system "cd ${destroot}/${prefix}/lib && ln -s libQtAssistantClient.dylib libQtAssistant.dylib"
}
-variant dbus description "Include DBus support" {
- depends_lib-append port:dbus
- configure.args-append -qdbus
-}
-
-variant nis description "Include Network Information Service (NIS) support" {
- configure.args-delete -no-nis
- configure.args-append -nis
-}
-
-variant cups description "Include Common Unix Printing System (CUPS) support" {
- configure.args-delete -no-cups
- configure.args-append -cups
-}
-
-variant mysql conflicts mysql5 description "Include support for SQL via mysql driver" {
- depends_lib-append lib:libmysqlclient.12:mysql4
- configure.args-delete -no-sql-mysql
- configure.args-append -qt-sql-mysql -plugin-sql-mysql \
- -I${prefix}/include/mysql -L${prefix}/lib/mysql
-}
-
-variant mysql5 conflicts mysql description "Include support for SQL via mysql5 driver" {
- depends_lib-append port:mysql5
- configure.args-delete -no-sql-mysql
- configure.args-append -qt-sql-mysql -plugin-sql-mysql \
- -I${prefix}/include/mysql5/mysql -L${prefix}/lib/mysql5/mysql
-}
-
-variant sqlite description "Include support for SQL via sqlite driver" {
- depends_lib-append port:sqlite3
- configure.args-delete -no-sql-sqlite
- configure.args-append -qt-sql-sqlite -plugin-sql-sqlite
- # -system-sqlite
-}
-
-variant ssl description "Include OpenSSL support" {
- depends_lib-append port:openssl
- configure.args-delete -no-openssl
- configure.args-append -openssl
-}
-
-variant examples description "Build Qt examples" {
- configure.args-append -make examples -examplesdir ${prefix}/share/${portname}/examples
-}
-
-variant demos description "Build Qt demos" {
- configure.args-append -make demos -demosdir ${prefix}/share/${portname}/demos
-}
-
livecheck.check regex
livecheck.url http://trolltech.com/developer/downloads/qt/x11
livecheck.regex "The current version of Qt/X11 Open Source Edition is (4(?:\\.\\d+)*)"
Deleted: trunk/dports/x11/qt4-x11/files/patch-Makefile.unix.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-Makefile.unix.diff 2008-05-21 22:44:10 UTC (rev 36981)
+++ trunk/dports/x11/qt4-x11/files/patch-Makefile.unix.diff 2008-05-22 00:20:53 UTC (rev 36982)
@@ -1,11 +0,0 @@
---- qmake/Makefile.unix.orig 2008-02-20 17:10:34.000000000 -0700
-+++ qmake/Makefile.unix 2008-02-20 17:10:51.000000000 -0700
-@@ -86,7 +86,7 @@
- -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
- -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL -DQT_BUILD_QMAKE \
- -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
-- -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
-+ -DQT_NO_GEOM_VARIANT -D__USE_WS_X11__ $(OPENSOURCE_CXXFLAGS)
-
- CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
-
Modified: trunk/dports/x11/qt4-x11/files/patch-q3process_unix.cpp.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-q3process_unix.cpp.diff 2008-05-21 22:44:10 UTC (rev 36981)
+++ trunk/dports/x11/qt4-x11/files/patch-q3process_unix.cpp.diff 2008-05-22 00:20:53 UTC (rev 36982)
@@ -1,29 +1,29 @@
---- src/qt3support/other/q3process_unix.cpp.orig 2008-02-20 19:52:59.000000000 -0700
-+++ src/qt3support/other/q3process_unix.cpp 2008-02-20 19:53:34.000000000 -0700
-@@ -761,7 +761,7 @@
+--- src/qt3support/other/q3process_unix.cpp.orig 2008-05-16 09:28:53.000000000 -0600
++++ src/qt3support/other/q3process_unix.cpp 2008-05-16 09:30:10.000000000 -0600
+@@ -772,7 +772,7 @@
#endif
i++;
}
-#ifdef Q_OS_MACX
-+#ifdef Q_WS_MACX
++#ifdef Q_WS_MAC
if(i) {
Q3CString arg_bundle = arglistQ[0];
QFileInfo fi(QString::fromUtf8(arg_bundle.constData()));
-@@ -858,7 +858,7 @@
+@@ -869,7 +869,7 @@
QStringList pathList = QStringList::split( QLatin1Char(':'), QString::fromLocal8Bit(getenv( "PATH" )) );
for (QStringList::Iterator it = pathList.begin(); it != pathList.end(); ++it ) {
QString dir = *it;
-#if defined(Q_OS_MACX) //look in a bundle
-+#if defined(Q_WS_MACX) //look in a bundle
++#if defined(Q_WS_MAC) //look in a bundle
if(!QFile::exists(dir + QLatin1Char('/') + command) && QFile::exists(dir + QLatin1Char('/') + command + QLatin1String(".app")))
dir += QLatin1Char('/') + command + QLatin1String(".app/Contents/MacOS");
#endif
-@@ -868,7 +868,7 @@
+@@ -879,7 +879,7 @@
QFileInfo fileInfo( dir + "/" + command );
#endif
if ( fileInfo.isExecutable() ) {
-#if defined(Q_OS_MACX)
-+#if defined(Q_WS_MACX)
++#if defined(Q_WS_MAC)
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
Modified: trunk/dports/x11/qt4-x11/files/patch-qlibrary_unix.cpp.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-qlibrary_unix.cpp.diff 2008-05-21 22:44:10 UTC (rev 36981)
+++ trunk/dports/x11/qt4-x11/files/patch-qlibrary_unix.cpp.diff 2008-05-22 00:20:53 UTC (rev 36982)
@@ -1,6 +1,6 @@
---- src/corelib/plugin/qlibrary_unix.cpp.orig 2008-02-20 19:25:57.000000000 -0700
-+++ src/corelib/plugin/qlibrary_unix.cpp 2008-02-20 19:26:36.000000000 -0700
-@@ -43,7 +43,7 @@
+--- src/corelib/plugin/qlibrary_unix.cpp.orig 2008-05-12 07:19:29.000000000 -0600
++++ src/corelib/plugin/qlibrary_unix.cpp 2008-05-12 07:22:48.000000000 -0600
+@@ -50,7 +50,7 @@
#ifndef QT_NO_LIBRARY
@@ -9,16 +9,36 @@
# include <private/qcore_mac_p.h>
#endif
-@@ -190,7 +190,7 @@
- pHnd = dlopen(QFile::encodeName(attempt), dlFlags);
+@@ -163,8 +163,9 @@
+ if (!fullVersion.isEmpty()) {
+ suffixes << QString::fromLatin1(".%1.bundle").arg(fullVersion);
+ suffixes << QString::fromLatin1(".%1.dylib").arg(fullVersion);
++ suffixes << QString::fromLatin1(".%1.so").arg(fullVersion);
+ } else {
+- suffixes << QLatin1String(".bundle") << QLatin1String(".dylib");
++ suffixes << QLatin1String(".bundle") << QLatin1String(".dylib") << QLatin1String(".so");
}
+ #endif
}
+@@ -179,7 +180,7 @@
+ }
+ #if !defined(Q_OS_CYGWIN)
+ else {
+-#if defined(Q_OS_MAC)
++#if defined(Q_WS_MAC)
+ if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4)
+ #endif
+ dlFlags |= RTLD_LOCAL;
+@@ -218,7 +219,7 @@
+ }
+ }
+
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
if (!pHnd) {
if (CFBundleRef bundle = CFBundleGetBundleWithIdentifier(QCFString(fileName))) {
QCFType<CFURLRef> url = CFBundleCopyExecutableURL(bundle);
-@@ -220,7 +220,7 @@
+@@ -248,7 +249,7 @@
return true;
}
Deleted: trunk/dports/x11/qt4-x11/files/patch-qmake.conf.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-qmake.conf.diff 2008-05-21 22:44:10 UTC (rev 36981)
+++ trunk/dports/x11/qt4-x11/files/patch-qmake.conf.diff 2008-05-22 00:20:53 UTC (rev 36982)
@@ -1,17 +0,0 @@
---- mkspecs/darwin-g++/qmake.conf.orig 2008-02-24 13:49:32.000000000 -0700
-+++ mkspecs/darwin-g++/qmake.conf 2008-02-24 13:52:05.000000000 -0700
-@@ -51,12 +51,13 @@
-
- QMAKE_LINK = c++
- QMAKE_LINK_SHLIB = c++
--QMAKE_LFLAGS =
-+QMAKE_LFLAGS = -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
- QMAKE_LFLAGS_RELEASE =
- QMAKE_LFLAGS_DEBUG =
- QMAKE_LFLAGS_APP = -prebind
- QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names
- QMAKE_LFLAGS_PLUGIN = -bundle
-+QMAKE_LFLAGS_SONAME = -Wl,-install_name,$$[QT_INSTALL_LIBS]/
- QMAKE_LFLAGS_THREAD =
-
- QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE}
Modified: trunk/dports/x11/qt4-x11/files/patch-qprocess_unix.cpp.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-qprocess_unix.cpp.diff 2008-05-21 22:44:10 UTC (rev 36981)
+++ trunk/dports/x11/qt4-x11/files/patch-qprocess_unix.cpp.diff 2008-05-22 00:20:53 UTC (rev 36982)
@@ -1,6 +1,6 @@
---- src/corelib/io/qprocess_unix.cpp.orig 2008-02-20 20:07:04.000000000 -0700
-+++ src/corelib/io/qprocess_unix.cpp 2008-02-20 20:08:38.000000000 -0700
-@@ -78,7 +78,7 @@
+--- src/corelib/io/qprocess_unix.cpp.orig 2008-05-12 04:40:17.000000000 -0600
++++ src/corelib/io/qprocess_unix.cpp 2008-05-12 04:42:36.000000000 -0600
+@@ -87,7 +87,7 @@
#include "qprocess.h"
#include "qprocess_p.h"
@@ -9,7 +9,7 @@
#include <private/qcore_mac_p.h>
#endif
-@@ -591,7 +591,7 @@
+@@ -621,7 +621,7 @@
// Encode the program name.
QByteArray encodedProgramName = QFile::encodeName(program);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080521/0c9b4d3b/attachment.htm
More information about the macports-changes
mailing list