[96896] trunk/dports/aqua/qt4-mac
michaelld at macports.org
michaelld at macports.org
Mon Aug 20 18:23:57 PDT 2012
Revision: 96896
https://trac.macports.org/changeset/96896
Author: michaelld at macports.org
Date: 2012-08-20 18:23:55 -0700 (Mon, 20 Aug 2012)
Log Message:
-----------
qt4-mac:
* fixes ticket #35506 : make sure QMAKE_FRAMEWORKDIR_QT is defined, to get Qt frameworks' LIBS defined correctly;
* fixes ticket #35067 : macdeployqt should look for frameworks in the correct location;
* equalize comment brackets;
* use new Qt4 plugin ports instead of having them as variants here; MUCH faster to get new plugins up and running in Qt4.
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff
Added Paths:
-----------
trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2012-08-20 23:49:04 UTC (rev 96895)
+++ trunk/dports/aqua/qt4-mac/Portfile 2012-08-21 01:23:55 UTC (rev 96896)
@@ -12,7 +12,7 @@
name qt4-mac
conflicts qt3 qt3-mac qt4-mac-devel
version 4.8.2
-revision 1
+revision 2
categories aqua
platforms macosx
maintainers michaelld openmaintainer
@@ -212,6 +212,11 @@
patchfiles-append patch-EXPERIMENTAL-ML-fixes.diff
}
+# (23) fix Framework directory in MacDeployQt tool
+
+patchfiles-append \
+ patch-tools_macdeployqt_shared_shared.cpp.diff
+
###############################################
# disable CCACHE for now (ticket #34856)
@@ -662,12 +667,9 @@
configure.args-append -framework
}
-variant mysql description {Enable MySQL SQL Driver} {
- depends_lib-append path:lib/mysql5:mysql5
- lunshift header_path ${prefix}/include/mysql5/mysql
- lunshift library_path ${prefix}/lib/mysql5/mysql
- configure.args-delete -no-sql-mysql
- configure.args-append -plugin-sql-mysql
+variant mysql description {MySQL Qt4 Plugin Legacy Compatibility Variant} {
+ ui_error "${name} variant +mysql has been replaced by the port 'qt4-mac-mysql55-plugin' and its subports. Please install ${name} without +mysql, then install your desired MySQL Qt plugin."
+ return -code error "Variant disabled"
}
variant odbc description {Enable iODBC SQL Driver} {
@@ -677,16 +679,16 @@
}
variant psql83 conflicts psql84 psql90 psql91 \
-description {Enable Postgre SQL Driver version 8.3} {}
+description {Postgre SQL 8.3 Qt4 Plugin Legacy Compatibility Variant} {}
variant psql84 conflicts psql83 psql90 psql91 \
-description {Enable Postgre SQL Driver version 8.4} {}
+description {Postgre SQL 8.4 Qt4 Plugin Legacy Compatibility Variant} {}
variant psql90 conflicts psql83 psql84 psql91 \
-description {Enable Postgre SQL Driver version 9.0} {}
+description {Postgre SQL 9.0 Qt4 Plugin Legacy Compatibility Variant} {}
variant psql91 conflicts psql83 psql84 psql90 \
-description {Enable Postgre SQL Driver version 9.1} {}
+description {Postgre SQL 9.1 Qt4 Plugin Legacy Compatibility Variant} {}
if {[variant_isset psql83]} {
set psql_version "83"
@@ -699,11 +701,8 @@
}
if {${psql_version} != ""} {
- depends_lib-append port:postgresql${psql_version}
- lunshift header_path ${prefix}/include/postgresql${psql_version}
- lunshift library_path ${prefix}/lib/postgresql${psql_version}
- configure.args-delete -no-sql-psql
- configure.args-append -plugin-sql-psql
+ ui_error "${name} variant +psql${psql_version} has been replaced by the port 'qt4-mac-postgresql91-plugin' and its subports. Please install ${name} without +psql${psql_version}, then install your desired Postgre SQL Qt plugin."
+ return -code error "Variant disabled"
}
variant sqlite2 description {Enable SQLite version 2 SQL Driver} {
@@ -744,7 +743,7 @@
#description {Build for X11 GUI, not Native OSX Quartz} {}
# if neither +x11 or +quartz were specified, default to the latter
-#if {![variant_isset quartz] && ![variant_isset x11]}
+#if {![variant_isset quartz] && ![variant_isset x11]} {
default_variants +quartz
#}
Modified: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff 2012-08-20 23:49:04 UTC (rev 96895)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff 2012-08-21 01:23:55 UTC (rev 96896)
@@ -1,6 +1,14 @@
---- mkspecs/common/mac.conf.orig 2012-04-23 14:49:04.000000000 -0400
-+++ mkspecs/common/mac.conf 2012-04-17 14:38:16.000000000 -0400
-@@ -38,7 +38,11 @@
+--- mkspecs/common/mac.conf.orig 2012-08-14 15:49:12.000000000 -0400
++++ mkspecs/common/mac.conf 2012-08-14 15:49:25.000000000 -0400
+@@ -9,6 +9,7 @@
+ QMAKE_LIBDIR =
+ QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
++QMAKE_FRAMEWORKDIR_QT = $$[QT_INSTALL_FRAMEWORKS]
+ QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \
+ /System/Library/Frameworks/AGL.framework/Headers/
+
+@@ -38,7 +39,11 @@
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
Added: trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff 2012-08-21 01:23:55 UTC (rev 96896)
@@ -0,0 +1,11 @@
+--- tools/macdeployqt/shared/shared.cpp.orig 2012-08-12 19:01:35.000000000 -0400
++++ tools/macdeployqt/shared/shared.cpp 2012-08-12 19:01:55.000000000 -0400
+@@ -139,7 +139,7 @@
+ state = DylibName;
+ continue;
+ } else if (part < parts.count() && parts.at(part).endsWith(".framework")) {
+- info.installName += "/" + (qtPath + "lib/").simplified();
++ info.installName += "/" + (qtPath + "Framework/").simplified();
+ info.frameworkDirectory = info.installName;
+ state = FrameworkName;
+ continue;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120820/642d230b/attachment-0001.html>
More information about the macports-changes
mailing list