Ticket #38682: webkit-gtk.diff

Portfile

@@ -118 +118 @@
 # https://bugs.webkit.org/show_bug.cgi?id=94488
 configure.universal_args-delete --disable-dependency-tracking
 
+# configure checks that we're clang 3.0, gcc 4.7, or better
+compiler.blacklist-append gcc-3.3 gcc-4.0 apple-gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
+compiler.blacklist-append macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
+compiler.blacklist-append {clang < 300} macports-clang-2.9
+
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
 if {[variant_isset universal]} {
     foreach arch ${configure.universal_archs} {
@@ -152 +157 @@
 use_autoreconf  yes
 autoreconf.args -fvi
 
-# configure checks that we're clang 3.0, gcc 4.7, or better
-compiler.blacklist-append gcc-3.3 gcc-4.0 apple-gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
-compiler.blacklist-append macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
-compiler.blacklist-append {clang < 300} macports-clang-2.9
-
-if {[string match *clang* ${configure.compiler}]} {
-    configure.cxxflags-append -Wno-c++11-extensions
-}
-
 lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
 
 post-patch {
@@ -217 +213 @@
         depends_build-append      port:python27
         # https://trac.macports.org/ticket/35793
         configure.python          ${prefix}/bin/python2.7
+
+        # https://trac.macports.org/ticket/38682
+        configure.optflags-append -fno-blocks
     }
 
     if {[string match "*10.5*" ${configure.sdkroot}] ||
@@ -243 +242 @@
 
 platform powerpc {
     # https://trac.macports.org/ticket/37839
-    configure.optflags -Os
+    configure.optflags-replace -O2 -Os
 }
 
+if {[string match *clang* ${configure.compiler}]} {
+    configure.cxxflags-append -Wno-c++11-extensions
+}
+
 livecheck.type  regex
 livecheck.url   http://webkitgtk.org/?page=download
 livecheck.regex webkitgtk-(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)