[46432] trunk/dports/x11/qt4-x11/files
mcalhoun at macports.org
mcalhoun at macports.org
Wed Feb 4 14:16:48 PST 2009
Revision: 46432
http://trac.macports.org/changeset/46432
Author: mcalhoun at macports.org
Date: 2009-02-04 14:16:47 -0800 (Wed, 04 Feb 2009)
Log Message:
-----------
qt4-x11: Remove patch file which are no longer used.
Removed Paths:
-------------
trunk/dports/x11/qt4-x11/files/patch-configure.diff
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
Deleted: trunk/dports/x11/qt4-x11/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-configure.diff 2009-02-04 22:15:24 UTC (rev 46431)
+++ trunk/dports/x11/qt4-x11/files/patch-configure.diff 2009-02-04 22:16:47 UTC (rev 46432)
@@ -1,10 +0,0 @@
---- configure.old 2008-09-27 04:58:41.000000000 -0400
-+++ configure 2008-10-23 00:02:20.000000000 -0400
-@@ -3917,6 +3917,7 @@
- if [ '!' -z "$D_FLAGS" ]; then
- for DEF in $D_FLAGS; do
- EXTRA_CFLAGS="$EXTRA_CFLAGS \"-D${DEF}\""
-+ EXTRA_CXXFLAGS="$EXTRA_CFLAGS \"-D${DEF}\""
- done
- fi
- QMAKE_BIN_DIR="$QT_INSTALL_BINS"
Deleted: trunk/dports/x11/qt4-x11/files/patch-q3process_unix.cpp.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-q3process_unix.cpp.diff 2009-02-04 22:15:24 UTC (rev 46431)
+++ trunk/dports/x11/qt4-x11/files/patch-q3process_unix.cpp.diff 2009-02-04 22:16:47 UTC (rev 46432)
@@ -1,29 +0,0 @@
---- 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_MAC
- if(i) {
- Q3CString arg_bundle = arglistQ[0];
- QFileInfo fi(QString::fromUtf8(arg_bundle.constData()));
-@@ -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_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
-@@ -879,7 +879,7 @@
- QFileInfo fileInfo( dir + "/" + command );
- #endif
- if ( fileInfo.isExecutable() ) {
--#if defined(Q_OS_MACX)
-+#if defined(Q_WS_MAC)
- arglistQ[0] = fileInfo.absFilePath().local8Bit();
- #else
- arglistQ[0] = fileInfo.filePath().local8Bit();
Deleted: trunk/dports/x11/qt4-x11/files/patch-qlibrary_unix.cpp.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-qlibrary_unix.cpp.diff 2009-02-04 22:15:24 UTC (rev 46431)
+++ trunk/dports/x11/qt4-x11/files/patch-qlibrary_unix.cpp.diff 2009-02-04 22:16:47 UTC (rev 46432)
@@ -1,49 +0,0 @@
---- 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
-
--#ifdef Q_OS_MAC
-+#ifdef Q_WS_MAC
- # include <private/qcore_mac_p.h>
- #endif
-
-@@ -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);
-@@ -248,7 +249,7 @@
- return true;
- }
-
--#ifdef Q_OS_MAC
-+#ifdef Q_WS_MAC
- Q_CORE_EXPORT void *qt_mac_resolve_sys(void *handle, const char *symbol)
- {
- return dlsym(handle, symbol);
Deleted: trunk/dports/x11/qt4-x11/files/patch-qprocess_unix.cpp.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-qprocess_unix.cpp.diff 2009-02-04 22:15:24 UTC (rev 46431)
+++ trunk/dports/x11/qt4-x11/files/patch-qprocess_unix.cpp.diff 2009-02-04 22:16:47 UTC (rev 46432)
@@ -1,20 +0,0 @@
---- 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"
-
--#ifdef Q_OS_MAC
-+#ifdef Q_WS_MAC
- #include <private/qcore_mac_p.h>
- #endif
-
-@@ -621,7 +621,7 @@
-
- // Encode the program name.
- QByteArray encodedProgramName = QFile::encodeName(program);
--#ifdef Q_OS_MAC
-+#ifdef Q_WS_MAC
- // allow invoking of .app bundles on the Mac.
- QFileInfo fileInfo(QString::fromUtf8(encodedProgramName.constData()));
- if (encodedProgramName.endsWith(".app") && fileInfo.isDir()) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090204/42c1760d/attachment-0001.html>
More information about the macports-changes
mailing list