Changeset 81844

Timestamp:

08/05/11 12:00:22 (4 years ago)

Author:

michaelld@…

Message:

qt4-mac: hopefully addresses tickets #30346 and #29141. Patch CoreWLan files to use the correct SDK and version (as either provided by the user, or the default for the given OS version); patch the MM file to work under 10.7.

Location:

trunk/dports/aqua/qt4-mac

Files:

• Portfile (modified) (5 diffs)
• files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff (modified) (1 diff)
• files/patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff (added)

trunk/dports/aqua/qt4-mac/Portfile

@@ -78 +78 @@
 # location under 10.6, e.g., for some developers doing both iOS and
 # OSX.  This patch does not change behavior for 10.4 or 10.5.
+# Also include fix to use the correct SDK.
 patchfiles-append   patch-src-plugins-bearer-corewlan-corewlan.pro.diff
 
@@ -86 +87 @@
 patchfiles-append   patch-NSDragOperation.diff
 
-global TARGET
-set TARGET ""
+# (8) Allow compiling under OS X 10.7
+patchfiles-append   patch-src-corelib-global-qglobal.h.diff
+
+# (9) fix #includes for OS X 10.7 in Bearer CoreWLAN
+patchfiles-append   patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff
+
+# find a way to specify the OS MINOR version.
+global MINOR
+set MINOR ""
+
+# hopefully the macosx_deployment_target exists and is set by now.  if
+# not, last resort (which is not desirable) is to use the os.version.
+if {${macosx_deployment_target} == ""} {
+    set MINOR [lindex [split ${macosx_deployment_target} "."] 1]
+} else {
+    set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
+}
 
 post-patch {
@@ -103 +119 @@
     reinplace "s|@ARCHES@|${ARCHES}|g" ${worksrcpath}/configure
 
+    global MINOR
+
     # set MACOSX_DEPLOYMENT_TARGET version in various places.  These
     # were all patched in (2) above, and can be easily changed or
     # overridden by the user in a project-local qmake .pro script.
-    set TARGET ${macosx_deployment_target}
-
-    # hopefully the TARGET exists and is set by now.  if not, last
-    # resort (which is not desirable) is to use the os.version.
-    if {${TARGET} == ""} {
-        set minor [expr [lindex [split ${os.version} "."] 0] - 4]
-        set TARGET "10.${minor}"
-    }
+    set TARGET "10.${MINOR}"
     foreach fixfile {configure mkspecs/common/mac-g++.conf \
                      mkspecs/common/mac.conf qmake/qmake.pri \
@@ -120 +131 @@
             ${worksrcpath}/${fixfile}
     }
+
+    # Fix OS version on Bearer CoreWLAN QMake file
+    reinplace "s|@MACOSX_VERSION_MINOR@|${MINOR}|g" \
+        ${worksrcpath}/src/plugins/bearer/corewlan/corewlan.pro
 
     # Ensure that correct C/C++ compilers are used.
@@ -296 +311 @@
         set SDK ${configure.sdkroot}
         if {${SDK} == ""} {
-            # find a way to specify the SDK to use, based on the TARGET
-            # hopefully the TARGET exists and is set by now.
-            # last resort: use os.version to get target (bad)
-            set minor ""
-            global TARGET
-            if {${TARGET} == ""} {
-                set minor [expr [lindex [split ${os.version} "."] 0] - 4]
-            } else {
-                set minor [lindex [split ${TARGET} "."] 1]
-            }
             # set SDK version depending on OS version
+            global MINOR
             set sdk_version ""
-            if {${minor} == "4"} {
+            if {${MINOR} == "4"} {
                 # OSX 10.4 requires an additional 'u'
                 set sdk_version "10.4u"
             } else {
-                set sdk_version "10.${minor}"
+                set sdk_version "10.${MINOR}"
             }
             set SDK ${developer_dir}/SDKs/MacOSX${sdk_version}.sdk

trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff

@@ -1 @@
---- src/plugins/bearer/corewlan/corewlan.pro.orig       2011-01-10 11:23:43.000000000 -0500
-+++ src/plugins/bearer/corewlan/corewlan.pro    2011-01-10 11:29:19.000000000 -0500
-@@ -5,7 +5,7 @@
+--- src/plugins/bearer/corewlan/corewlan.pro.orig       2011-08-04 21:23:52.000000000 -0400
++++ src/plugins/bearer/corewlan/corewlan.pro    2011-08-04 21:24:31.000000000 -0400
+@@ -5,9 +5,9 @@
  LIBS += -framework Foundation -framework SystemConfiguration
  
  contains(QT_CONFIG, corewlan) {
 -    isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
-+    isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "@DEVELOPER_DIR@/SDKs/MacOSX10.6.sdk") {
++    isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "@DEVELOPER_DIR@/SDKs/MacOSX10.@MACOSX_VERSION_MINOR@.sdk") {
           LIBS += -framework CoreWLAN -framework Security
-          DEFINES += MAC_SDK_10_6
+-         DEFINES += MAC_SDK_10_6
++         DEFINES += MAC_SDK_10_@MACOSX_VERSION_MINOR@
      }
+ }
+