Ticket #43329: Portfile-qt4-mac.diff

Portfile

@@ -50 +50 @@
                     port:openssl port:tiff \
                     port:libpng port:libmng port:jpeg
 
+# 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} ne ""} {
+    set MINOR [lindex [split ${macosx_deployment_target} "."] 1]
+} else {
+    set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
+}
+
 ###############################################
 # Patches are used to both fix compiling on various OS versions, and
 # to enhance the functionality of QMake and its build files.  Some of
@@ -221 +233 @@
 # to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead.  For
 # some reason 10.5+ "knows" that how to do this correctly.
 
-platform darwin 8 {
-    patchfiles-append patch-QtHelp_10.4_only.diff
+platform darwin {
+    if {${MINOR} == 4} {
+        patchfiles-append patch-QtHelp_10.4_only.diff
+    }
 }
 
 # (20) fix the Mac timer's use of "mach_timebase_info"
@@ -238 +252 @@
 # (22) Under 10.8 and 10.9: Patch to fix corelib linking
 
 platform darwin {
-    if {${os.major} > 12} {
+    if {${MINOR} >= 8} {
         patchfiles-append patch-src_corelib_corelib.pro.diff
     }
 }
@@ -257 +271 @@
 # (26) Fix qglobals.h to build under 10.9 CLang
 # (27 a-e) Fix WebKit to build under 10.9 CLang
 
-platform darwin 13 {
-    patchfiles-append   \
-        patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp.diff \
-        patch-src_corelib_global_qglobal.h.diff \
-        patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h.diff \
-        patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp.diff \
-        patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp.diff \
-        patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp.diff \
-        patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp.diff
-
-    # Copy new version of webkit's lib for OS X 10.9 only.
-    # Attached by reference:
-    # https://codereview.qt-project.org/#change,69328
-    # http://trac.webkit.org/browser/trunk/WebKitLibraries/ChangeLog?rev=157771
-
-    distfiles-append libWebKitSystemInterfaceMavericks.a
-    post-patch {
-        copy ${distpath}/libWebKitSystemInterfaceMavericks.a \
-            ${worksrcpath}/src/3rdparty/webkit/WebKitLibraries
+platform darwin {
+    if {${MINOR} >= 9} {
+        patchfiles-append   \
+            patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp.diff \
+            patch-src_corelib_global_qglobal.h.diff \
+            patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h.diff \
+            patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp.diff \
+            patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp.diff \
+            patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp.diff \
+            patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp.diff
+
+        # Copy new version of webkit's lib for OS X 10.9 only.
+        # Attached by reference:
+        # https://codereview.qt-project.org/#change,69328
+        # http://trac.webkit.org/browser/trunk/WebKitLibraries/ChangeLog?rev=157771
+
+        distfiles-append libWebKitSystemInterfaceMavericks.a
+        post-patch {
+            copy ${distpath}/libWebKitSystemInterfaceMavericks.a \
+                ${worksrcpath}/src/3rdparty/webkit/WebKitLibraries
+        }
     }
 }
 
 platform darwin {
-    if {${os.major} > 13} {
+    if {${MINOR} >= 9} {
         # This project needs to be updated to build with clang++ against libc++
         depends_lib
         depends_run
@@ -297 +313 @@
 
 configure.ccache no
 
-# 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} ne ""} {
-    set MINOR [lindex [split ${macosx_deployment_target} "."] 1]
-} else {
-    set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
-}
-
 # find a way to specify the SDK to use; Qt will use the 10.4u by
 # default which won't work on 10.6 since it is not supported.  Allow
 # the user to specify the SDK if desired.