[96204] trunk/dports/aqua/qt4-mac

[eborisch at macports.org]

Revision: 96204
          https://trac.macports.org/changeset/96204
Author:   eborisch at macports.org
Date:     2012-08-03 14:36:07 -0700 (Fri, 03 Aug 2012)
Log Message:
-----------
qt4-mac: Add patch to get Mountain Lion users up and running. Likely needs further testing / refinement. See #35313.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2012-08-03 21:31:51 UTC (rev 96203)
+++ trunk/dports/aqua/qt4-mac/Portfile	2012-08-03 21:36:07 UTC (rev 96204)
@@ -192,6 +192,13 @@
     patchfiles-append patch-QtHelp_10.4_only.diff
 }
 
+# Temporary patch to get ML working; some of this is already upstream 
+# https://codereview.qt-project.org/#change,31759
+# See also https://trac.macports.org/ticket/35430
+platform darwin 12 {
+    patchfiles-append patch-EXPERIMENTAL-ML-fixes.diff
+}
+
 ###############################################
 
 # find a way to specify the OS MINOR version.

Added: trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff	2012-08-03 21:36:07 UTC (rev 96204)
@@ -0,0 +1,23 @@
+--- ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig	2012-08-02 23:32:52.000000000 -0500
++++ ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro	2012-08-02 23:35:52.000000000 -0500
+@@ -253,6 +253,8 @@
+             LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+         } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") {
+             LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
++        } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk") {
++            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
+         }
+     }
+ }
+--- ./src/corelib/corelib.pro.orig	2012-08-02 23:29:31.000000000 -0500
++++ ./src/corelib/corelib.pro	2012-08-02 23:31:24.000000000 -0500
+@@ -27,6 +27,9 @@
+ } else:mac|darwin {
+         LIBS_PRIVATE += -framework CoreFoundation -framework Security
+ }
++
++LIBS_PRIVATE += -framework Foundation
++
+ mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
+ win32:DEFINES-=QT_NO_CAST_TO_ASCII
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120803/7d06723d/attachment-0001.html>