[114233] trunk/dports/www/webkit-gtk

jeremyhu at macports.org jeremyhu at macports.org
Tue Dec 3 01:16:36 PST 2013 

Revision: 114233
          https://trac.macports.org/changeset/114233
Author:   jeremyhu at macports.org
Date:     2013-12-03 01:16:36 -0800 (Tue, 03 Dec 2013)
Log Message:
-----------
webkit-gtk: Bump to 2.2.2

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit-gtk/files/execinfo.patch
    trunk/dports/www/webkit-gtk/files/quartz-webcore.patch

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/clang-check.patch
    trunk/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2013-12-03 09:13:01 UTC (rev 114232)
+++ trunk/dports/www/webkit-gtk/Portfile	2013-12-03 09:16:36 UTC (rev 114233)
@@ -8,7 +8,7 @@
 
 name        webkit-gtk
 epoch       2
-version     2.0.4
+version     2.2.2
 description Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers jeremyhu devans
@@ -21,9 +21,9 @@
 use_xz      yes
 distname    webkitgtk-${version}
 
-checksums           sha1    3b9ddbdc61e38b5c8fdd108e891b7db5fb12d55a \
-                    rmd160  19643cac3f53928757a7c3fe8ea33f144a581456 \
-                    sha256  bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f
+checksums           sha1    6376d7d55802c3389c74a2ca8a33d53efc340c37 \
+                    rmd160  2f4ec373d71f7912e2315bf09c708df90da5e61c \
+                    sha256  4a45768695ccded14fdc47f99dbcdb750076f55dad61560cadac7b55db0b304d
 
 depends_lib \
         path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -54,6 +54,7 @@
 # ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
 # tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
 # quartz-webcore.patch: No upstream bug, http://trac.macports.org/ticket/39898
+# clang-check.patch: No upstream bug, emailed mailing list
 
 patchfiles \
         clang-assertions.patch \
@@ -65,7 +66,9 @@
         ppc.patch \
         tiger.patch \
         quartz-webcore.patch \
-        patch-freetype-includes.diff
+        clang-check.patch \
+        patch-freetype-includes.diff \
+        no-WebCoreLayer.a.patch
 
 conflicts_build     google-test
 
@@ -80,8 +83,28 @@
         --enable-geolocation \
         --enable-webgl
 
+platform darwin {
+    set cxx_stdlib {}
+
+    if {[info exists configure.cxx_stdlib] &&
+        ${configure.cxx_stdlib} ne {} &&
+        [string match *clang* ${configure.cxx}]} {
+        set cxx_stdlib ${configure.cxx_stdlib}
+    } elseif {[string match *clang* ${configure.cxx}] &&
+              ${os.major} >= 13} {
+        set cxx_stdlib libc++
+    } else {
+        set cxx_stdlib libstdc++
+    }
+
+    if {${cxx_stdlib} == "libstdc++"} {
+       ui_error "${subport} is not supported for this installation of MacPorts.  It requires libc++ be selected as your C++ runtime.  Please use ${subport}-2.0 instead"
+       error "unsupported configuration"
+    }
+}
+
 subport webkit-gtk3 {
-    revision 2
+    conflicts   webkit-gtk3-2.0
     depends_lib-append      port:gtk3
     configure.args-append   --with-gtk=3.0
 
@@ -112,8 +135,7 @@
 }
 
 if {${name} == ${subport}} {
-    revision 1
-
+    conflicts   webkit-gtk-2.0
     depends_lib-append      port:gtk2
     configure.args-append   --with-gtk=2.0
 }
@@ -156,9 +178,13 @@
 # google-test suite build fix
 configure.cppflags-append -DGTEST_USE_OWN_TR1_TUPLE=1
 
+# https://trac.macports.org/ticket/41560#comment:2
+configure.cflags-append -ftemplate-depth=256
+configure.cxxflags-append -ftemplate-depth=256
+
 autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
 use_autoreconf  yes
-autoreconf.args -fi
+autoreconf.args -fvi
 
 lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
 
@@ -176,6 +202,18 @@
     # https://bugs.webkit.org/show_bug.cgi?id=58737
     reinplace "s:OS(MAC_OS_X):PLATFORM(MAC):" \
         ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp
+
+    # Emailed to webkit-gtk mailing list 11/26/13
+    reinplace "s:-stdlib=libstdc\+\+::" \
+        ${worksrcpath}/Source/autotools/SetupCompilerFlags.m4
+
+    # TODO: Email/file a bug
+    # In file included from Source/JavaScriptCore/runtime/JSGlobalObject.cpp:83:
+    # ./Source/JavaScriptCore/API/ObjCCallbackFunction.h:32:9: fatal error: 'JavaScriptCore/JSCallbackFunction.h' file not found
+    # #import <JavaScriptCore/JSCallbackFunction.h>
+    #         ^
+    reinplace "/^#define JSC_OBJC_API_ENABLED/s/^.*$/#define JSC_OBJC_API_ENABLED 0/" \
+        ${worksrcpath}/Source/JavaScriptCore/API/JSBase.h
 }
 
 # TODO: fix this for muniversal

Added: trunk/dports/www/webkit-gtk/files/clang-check.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/clang-check.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/clang-check.patch	2013-12-03 09:16:36 UTC (rev 114233)
@@ -0,0 +1,20 @@
+--- Source/autotools/CheckSystemAndBasicDependencies.m4.orig	2013-11-10 17:44:57.000000000 -0800
++++ Source/autotools/CheckSystemAndBasicDependencies.m4	2013-11-10 17:45:57.000000000 -0800
+@@ -87,7 +87,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ #endif
+ ])], [c_compiler="gcc"], [])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 2)
++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))))
+ #error Not a supported Clang compiler
+ #endif
+ ])], [c_compiler="clang"], [])
+@@ -106,7 +106,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ #endif
+ ])], [cxx_compiler="g++"], [])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 2)
++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))))
+ #error Not a supported Clang++ compiler
+ #endif
+ ])], [cxx_compiler="clang++"], [])

Modified: trunk/dports/www/webkit-gtk/files/execinfo.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/execinfo.patch	2013-12-03 09:13:01 UTC (rev 114232)
+++ trunk/dports/www/webkit-gtk/files/execinfo.patch	2013-12-03 09:16:36 UTC (rev 114233)
@@ -28,8 +28,8 @@
  
  void WTFGetBacktrace(void** stack, int* size)
  {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if ((OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
++#if (OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))
      *size = backtrace(stack, *size);
  #elif OS(WINDOWS) && !OS(WINCE)
      // The CaptureStackBackTrace function is available in XP, but it is not defined

Added: trunk/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch	2013-12-03 09:16:36 UTC (rev 114233)
@@ -0,0 +1,28 @@
+--- Tools/TestWebKitAPI/GNUmakefile.am.orig	2013-11-11 00:32:41.000000000 -0800
++++ Tools/TestWebKitAPI/GNUmakefile.am	2013-11-26 10:40:03.000000000 -0800
+@@ -117,16 +117,6 @@ webcore_layer_deps += \
+ 	libANGLE.la
+ endif
+ 
+-webcore_layer_archives = $(foreach lib, $(webcore_layer_deps), $(shell echo $(lib) | sed "s/\(.*\)\.la/.libs\/\1.a/"))
+-
+-WebCoreLayer.a: $(webcore_layer_deps)
+-	$(AM_V_GEN)
+-	$(AM_V_at)$(shell rm -f $@)
+-	$(AM_V_at)$(foreach archive, $(webcore_layer_archives), $(shell ar t $(archive) | xargs -n50 ar cruT $@))
+-
+-DISTCLEANFILES += \
+-	$(top_builddir)/WebCoreLayer.a
+-
+ Programs_TestWebKitAPI_TestWebCore_CPPFLAGS = \
+ 	$(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
+ 	-I$(top_builddir)/DerivedSources/WebCore/include
+@@ -140,7 +130,7 @@ Programs_TestWebKitAPI_TestWebCore_LDADD
+ 	Libraries/libgtest.la \
+ 	libjavascriptcoregtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
+ 	libWTF.la \
+-	WebCoreLayer.a \
++	$(webcore_layer_deps) \
+ 	$(CAIRO_LIBS) \
+ 	$(FREETYPE_LIBS) \
+ 	$(GAMEPAD_LIBS) \

Modified: trunk/dports/www/webkit-gtk/files/quartz-webcore.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz-webcore.patch	2013-12-03 09:13:01 UTC (rev 114232)
+++ trunk/dports/www/webkit-gtk/files/quartz-webcore.patch	2013-12-03 09:16:36 UTC (rev 114233)
@@ -1,14 +1,3 @@
---- Source/WebCore/bridge/npruntime_internal-orig.h	2013-07-19 00:04:01.000000000 -0700
-+++ Source/WebCore/bridge/npruntime_internal.h	2013-08-12 16:04:17.000000000 -0700
-@@ -29,7 +29,7 @@
- #include "npfunctions.h"
- #include "npruntime.h"
- 
--#ifdef XP_UNIX
-+#if PLATFORM(X11)
-     #include <X11/Xresource.h>
- 
-     #undef None
 --- Source/WebCore/plugins/PluginView-orig.cpp	2013-07-19 00:04:11.000000000 -0700
 +++ Source/WebCore/plugins/PluginView.cpp	2013-08-12 17:48:20.000000000 -0700
 @@ -865,7 +865,7 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131203/aa5e9a15/attachment.html>

More information about the macports-changes mailing list