[68459] trunk/dports/aqua/qt4-mac
mcalhoun at macports.org
mcalhoun at macports.org
Thu Jun 3 16:43:59 PDT 2010
Revision: 68459
http://trac.macports.org/changeset/68459
Author: mcalhoun at macports.org
Date: 2010-06-03 16:43:56 -0700 (Thu, 03 Jun 2010)
Log Message:
-----------
qt4-mac: Undo r37370.
See http://lists.macosforge.org/pipermail/macports-dev/2010-May/011889.html
Remove unused patchfiles.
Revision Links:
--------------
http://trac.macports.org/changeset/37370
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
Removed Paths:
-------------
trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff
trunk/dports/aqua/qt4-mac/files/patch-odbc.diff
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2010-06-03 22:21:46 UTC (rev 68458)
+++ trunk/dports/aqua/qt4-mac/Portfile 2010-06-03 23:43:56 UTC (rev 68459)
@@ -6,7 +6,7 @@
name qt4-mac
conflicts qt4-mac-devel kdelibs3 kdelibs4 libevent xmlrpcxx
version 4.6.2
-revision 1
+revision 2
categories aqua
platforms macosx
maintainers nomaintainer
@@ -27,10 +27,8 @@
depends_lib port:zlib port:dbus port:openssl port:sqlite3 \
port:tiff port:libpng port:libmng port:jpeg
-# Build plugins as bundle files instead of dylib files.
# Test for Precompiled-headers support requires a C++ compiler, but configure calls it, by default, with a C compiler.
-patchfiles patch-mac.conf.diff \
- patch-precomp.test.diff
+patchfiles patch-precomp.test.diff
# The build process uses -fconstant-cfstrings.
# configure.compiler should therefore not be one of the MacPorts compilers.
Deleted: trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff 2010-06-03 22:21:46 UTC (rev 68458)
+++ trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff 2010-06-03 23:43:56 UTC (rev 68459)
@@ -1,25 +0,0 @@
-Index: mkspecs/common/mac.conf
-===================================================================
---- mkspecs/common/mac.conf (revision 814547)
-+++ mkspecs/common/mac.conf (working copy)
-@@ -5,6 +5,7 @@
- QMAKE_RESOURCE = /Developer/Tools/Rez
-
- QMAKE_EXTENSION_SHLIB = dylib
-+QMAKE_EXTENSION_PLUGIN = bundle
-
- QMAKE_LIBDIR =
- QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
-Index: mkspecs/common/mac-g++.conf
-===================================================================
---- mkspecs/common/mac-g++.conf (revision 814547)
-+++ mkspecs/common/mac-g++.conf (working copy)
-@@ -55,7 +55,7 @@
- QMAKE_LFLAGS_DEBUG +=
- QMAKE_LFLAGS_APP +=
- QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib
--QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
-+QMAKE_LFLAGS_PLUGIN += -bundle
- QMAKE_LFLAGS_THREAD +=
- QMAKE_LFLAGS_INCREMENTAL+= -undefined suppress -flat_namespace
- QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}
Deleted: trunk/dports/aqua/qt4-mac/files/patch-odbc.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-odbc.diff 2010-06-03 22:21:46 UTC (rev 68458)
+++ trunk/dports/aqua/qt4-mac/files/patch-odbc.diff 2010-06-03 23:43:56 UTC (rev 68459)
@@ -1,38 +0,0 @@
---- src/sql/drivers/odbc/qsql_odbc.h.orig 2009-02-25 16:09:26.000000000 -0500
-+++ src/sql/drivers/odbc/qsql_odbc.h 2009-03-11 13:56:31.000000000 -0400
-@@ -49,13 +49,6 @@
- #include <QtCore/qt_windows.h>
- #endif
-
--#if defined (Q_OS_MAC) && (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3)
--// assume we use iodbc on MACX
--// comment next line out if you use a
--// unicode compatible manager
--# define Q_ODBC_VERSION_2
--#endif
--
- #ifdef QT_PLUGIN
- #define Q_EXPORT_SQLDRIVER_ODBC
- #else
---- src/plugins/sqldrivers/odbc/odbc.pro.orig 2009-02-25 16:09:25.000000000 -0500
-+++ src/plugins/sqldrivers/odbc/odbc.pro 2009-03-11 13:58:02.000000000 -0400
-@@ -6,7 +6,7 @@
-
- mac {
- !contains( LIBS, .*odbc.* ) {
-- LIBS *= -liodbc
-+ LIBS *= -lodbc
- }
- }
-
---- src/sql/drivers/drivers.pri.orig 2009-06-20 00:57:58.000000000 -0400
-+++ src/sql/drivers/drivers.pri 2009-07-01 16:38:05.000000000 -0400
-@@ -47,7 +47,7 @@
- HEADERS += drivers/odbc/qsql_odbc.h
- SOURCES += drivers/odbc/qsql_odbc.cpp
-
-- mac:!contains( LIBS, .*odbc.* ):LIBS *= -liodbc
-+ mac:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc
- unix:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc
-
- win32 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100603/71a16a7b/attachment-0001.html>
More information about the macports-changes
mailing list