Changeset 99541

Timestamp:

Nov 9, 2012, 3:32:16 PM (11 years ago)

Author:

nicos@…

Message:

kdevplatform: update to 1.4.1, enabling universal variant

File:

• trunk/dports/kde/kdevplatform/Portfile (modified) (5 diffs)

trunk/dports/kde/kdevplatform/Portfile

@@ -4 +4 @@
 PortSystem          1.0
 PortGroup           kde4 1.1
+PortGroup           muniversal 1.0
 
 name                kdevplatform
-version             1.4.0
+version             1.4.1
 categories          kde kde4
 platforms           darwin
@@ -19 +20 @@
                     Quanta, Kile, KTechLab ... etc.
 
-set kdevelopversion 4.4.0
+set kdevelopversion 4.4.1
 
 homepage            http://www.kdevelop.org/
@@ -25 +26 @@
 distname            ${name}-${version}
 
-checksums           rmd160  e15b8a5733500efcba9f48232201153c9ed4f2bb \
-                    sha256  fd00aff21af14c07eca6e0dfbc0d4dd1edcc4ec3c50e6a5dd7e962214922c08e
+checksums           rmd160  2726503031278ee0da8357cfa3796edb4625c398 \
+                    sha256  d48dba12cc61e006d1ed63c664a1cfa0d6c86a241b633565cda034cd42a78033
 
 use_bzip2           yes
@@ -33 +34 @@
                     port:boost
 
-#Deactivating subversion detection at configure to avoid hidden \
-#use of system one (ticket #35185)
-patchfiles-append   patch-pluginsCMakeLists.diff
+#1. Deactivating subversion detection at configure to avoid hidden \
+#   use of system one (ticket #35185)
+#2. Suppress ambiguous use of Sublime::Position class
+patchfiles-append   patch-pluginsCMakeLists.diff \
+                    patch-uicontroller.cpp.diff
 
 variant subversion description {Add subversion support for kdevelop} {
@@ -42 +45 @@
 }
 
-#Adjusting configure flags for Clang
-if {${configure.compiler} == "clang"} {
-    if {${os.major} >= 11} {
-        #Case of Lion and higher (ticket #34545)
-        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++" \
-                                -DHAVE_UNORDERED_MAP=1
+#Deleting double architecture build from cmake group
+pre-configure {
+    configure.universal_args-delete \
+        -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
+    if {${configure.sdkroot} != ""} {
+        configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
     } else {
-        #Patching code for clang on SL where libc++ is not available (ticket #34859)
-        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal"
-        patchfiles-append       patch-uicontroller.cpp.diff
+        configure.args-append -DCMAKE_OSX_SYSROOT=/
     }
-} else {
-    #Patching code in case of gcc
-    patchfiles-append       patch-uicontroller.cpp.diff
+}
+
+if {${configure.compiler} == "clang" && ${os.major} >= 11} {
+    array set merger_configure_args {
+        i386   ""
+        x86_64 "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++\" -DHAVE_UNORDERED_MAP=1"
+    }
+}
+
+if {![variant_isset universal]} {
+    #Using c++0x for Lion and higher in case of clang 64-bit
+    if {${configure.compiler} == "clang" && ${build_arch} == "x86_64" && ${os.major} >= 11} {
+        configure.args-append   -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
+    }
 }