Ticket #40852: Portfile.2.diff

Portfile

@@ -1 +1 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
+# $Id: Portfile 111912 2013-10-05 22:01:13Z raimue@macports.org $
 
 PortSystem          1.0
 
@@ -171 +171 @@
 
 patchfiles-append   patch-src_plugins_bearer_corewlan_corewlan.pro.diff
 
-# (15) fix the corewlan source to work under 10.7
+# (15) fix the corewlan source to work under 10.9 too
 
 patchfiles-append   patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
 
@@ -229 +229 @@
     patchfiles-append patch-src_corelib_corelib.pro.diff
 }
 
+# (22a) Under 10.9 too: Patch to fix corelib linking
+
+platform darwin 13 {
+    patchfiles-append patch-src_corelib_corelib.pro.diff
+}
+
 # (23) fix Framework directory in MacDeployQt tool
 
 patchfiles-append   \
@@ -239 +245 @@
 patchfiles-append   \
     patch-libc++.diff
 
-# TODO: More patches to fix Mavericks build
+# (25) Fix CLuscene to build under 10.9 CLang
+# (26) Fix qglobals.h 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
+}
+
+# Mavericks build should be fixed...
 platform darwin {
-    if {${os.major} >= 13} {
+    if {${os.major} > 13} {
         # This project needs to be updated to build with clang++ against libc++
         depends_lib
         depends_run
         pre-fetch {
-            ui_error "$name does not build on OS X 10.9 Mavericks or later."
+            ui_error "$name does not build on OS's later than X 10.9 Mavericks."
             error "unsupported platform"
         }
     }
@@ -509 +524 @@
     -no-pch                                               \
     -framework                                            \
     -no-phonon                                            \
-    -no-phonon-backend
+    -no-phonon-backend \
+    -no-webkit
 
 # Stop configure script from searching for SQL Drivers
 #    not available from MacPorts.