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

26 Mar 2014

Revision: 118229
          https://trac.macports.org/changeset/118229
Author:   jeremyhu@macports.org
Date:     2014-03-26 11:38:39 -0700 (Wed, 26 Mar 2014)
Log Message:
-----------
webkit-gtk: Version bump to 2.4.0

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit-gtk/files/clang-check.patch

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/gstreamer.patch
    trunk/dports/www/webkit-gtk/files/libedit.patch

Removed Paths:
-------------
    trunk/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================

--- trunk/dports/www/webkit-gtk/Portfile	2014-03-26 18:38:25 UTC (rev 118228)
+++ trunk/dports/www/webkit-gtk/Portfile	2014-03-26 18:38:39 UTC (rev 118229)
@@ -1,6 +1,10 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
+# We have an umbrella radar tracking webkit-gtk issues on OS X.  Please relate
+# any future issues with this tracker.
+# http://bugs.webkit.org/show_bug.cgi?id=126492
+
 PortSystem  1.0
 PortGroup   conflicts_build 1.0
 PortGroup   muniversal 1.0
@@ -8,8 +12,7 @@
 
 name        webkit-gtk
 epoch       2
-version     2.2.3
-revision    1
+version     2.4.0
 description Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers jeremyhu devans
@@ -22,10 +25,12 @@
 use_xz      yes
 distname    webkitgtk-${version}
 
-checksums           sha1    57fa31c489e7fd5d405e0753e6e6f15933b143f3 \
-                    rmd160  8e63661e2ac9e91d24588ac5377967190623c44c \
-                    sha256  94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605
+dist_subdir webkit-gtk
 
+checksums           sha1    d7dade39ebeded72ddf7ac37a9d9ed17ac68dcba \
+                    rmd160  a2a17a8c69b614e068af3627169c90b2dca45afc \
+                    sha256  dc5277cda89ee038408f78c94b1b07f101997f01ef877a142ffedac3b537dfbb
+
 depends_lib \
         path:lib/pkgconfig/glib-2.0.pc:glib2 \
         port:bison \
@@ -52,6 +57,8 @@
 # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
 # quartz-duplicate-symbols.patch: https://bugs.webkit.org/show_bug.cgi?id=126821
 # clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
+# gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
+# libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
 
 patchfiles \
         clang-assertions.patch \
@@ -60,7 +67,8 @@
         quartz-duplicate-symbols.patch \
         quartz-webcore.patch \
         clang-check.patch \
-        no-WebCoreLayer.a.patch
+        gstreamer.patch \
+        libedit.patch
 
 conflicts_build     google-test
 
@@ -68,8 +76,10 @@
 configure.python    /usr/bin/python
 
 # --disable-webkit2: https://bugs.webkit.org/show_bug.cgi?id=126416
+# --disable-web-audio: https://bugs.webkit.org/show_bug.cgi?id=126438
 configure.args  \
         --disable-webkit2 \
+        --disable-web-audio \
         --enable-introspection \
         --disable-video \
         --enable-svg \
@@ -100,7 +110,7 @@
 }
 
 subport webkit-gtk3 {
-    conflicts   webkit-gtk3-2.0 webkit-gtk3-devel
+    conflicts   webkit-gtk3-devel webkit-gtk3-2.0
     depends_lib-append      port:gtk3
     configure.args-append   --with-gtk=3.0
 
@@ -118,6 +128,7 @@
             foreach arch ${universal_archs_to_use} {
                 set docpath ${workpath}/destroot-${arch}${prefix}/share/gtk-doc/html
                 move ${docpath}/webkitgtk ${docpath}/webkitgtk3
+                move ${docpath}/webkitdomgtk ${docpath}/webkitdomgtk3
                 move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
             }
         }
@@ -125,13 +136,14 @@
         post-destroot {
            set docpath ${destroot}${prefix}/share/gtk-doc/html
            move ${docpath}/webkitgtk ${docpath}/webkitgtk3
+           move ${docpath}/webkitdomgtk ${docpath}/webkitdomgtk3
            move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
         }
     }
 }
 
 if {${name} eq ${subport}} {
-    conflicts   webkit-gtk-2.0 webkit-gtk-devel
+    conflicts   webkit-gtk-devel webkit-gtk-2.0
     depends_lib-append      port:gtk2
     configure.args-append   --with-gtk=2.0
 }
@@ -155,19 +167,6 @@
     destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
 }
 
-# In 1.10.1:
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp: In constructor 'WebCore::FFTFrame::FFTFrame(unsigned int)':
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: 'm_complexData' was not declared in this scope
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: 'GstFFTF32Complex' was not declared in this scope
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: no matching function for call to 'fastNewArray(size_t)'
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:50: error: 'gst_fft_next_fast_length' was not declared in this scope
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'm_fft' was not declared in this scope
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'FALSE' was not declared in this scope
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'gst_fft_f32_new' was not declared in this scope
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:52: error: 'm_inverseFft' was not declared in this scope
-# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:52: error: 'TRUE' was not declared in this scope
-#        --enable-web-audio \
-
 # We don't want to use the headers from the installed WebKit
 configure.cppflags-delete -I${prefix}/include
 
@@ -185,16 +184,10 @@
 lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
 
 post-patch {
-    # https://bugs.webkit.org/show_bug.cgi?id=88407
-    reinplace "s:echo -n:/bin/echo -n:g" \
-        ${worksrcpath}/Source/WebCore/GNUmakefile.am
+    # https://bugs.webkit.org/show_bug.cgi?id=126433
+    reinplace "s/def __APPLE__/ 0/" \
+        ${worksrcpath}/Source/JavaScriptCore/API/WebKitAvailability.h
 
-    # https://bugs.webkit.org/show_bug.cgi?id=99683
-    reinplace "s:PLATFORM(MAC):OS(DARWIN):g" \
-        ${worksrcpath}/Source/JavaScriptCore/heap/VTableSpectrum.cpp \
-        ${worksrcpath}/Source/JavaScriptCore/jit/ThunkGenerators.cpp \
-        ${worksrcpath}/Source/JavaScriptCore/tools/CodeProfile.cpp
-
     # https://bugs.webkit.org/show_bug.cgi?id=58737
     reinplace "s:OS(MAC_OS_X):PLATFORM(MAC):" \
         ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp
@@ -218,6 +211,10 @@
 #    file copy ${worksrcpath}/Programs/.libs/GtkLauncher ${destroot}${prefix}/bin
 #}
 
+# Apple's gnumake (patched 3.81) gets wedged at some point during the build process
+depends_build-append port:gmake
+build.cmd ${prefix}/bin/gmake
+
 build.args-append V=1
 
 # see bug #24622
@@ -256,4 +253,4 @@
 
 livecheck.type  regex
 livecheck.url   http://webkitgtk.org/?page=download
-livecheck.regex webkitgtk-(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)
+livecheck.regex "webkitgtk-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Modified: trunk/dports/www/webkit-gtk/files/clang-check.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/clang-check.patch	2014-03-26 18:38:25 UTC (rev 118228)
+++ trunk/dports/www/webkit-gtk/files/clang-check.patch	2014-03-26 18:38:39 UTC (rev 118229)
@@ -1,20 +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([
+--- Source/autotools/CheckSystemAndBasicDependencies.m4.orig	2014-01-23 08:49:59.000000000 -0800
++++ Source/autotools/CheckSystemAndBasicDependencies.m4	2014-02-05 17:29:39.000000000 -0800
+@@ -92,7 +92,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)))))
+-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
  #error Not a supported Clang compiler
  #endif
  ])], [c_compiler="clang"], [])
-@@ -106,7 +106,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+@@ -111,7 +111,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)))))
+-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
  #error Not a supported Clang++ compiler
  #endif
  ])], [cxx_compiler="clang++"], [])

Added: trunk/dports/www/webkit-gtk/files/gstreamer.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/gstreamer.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/gstreamer.patch	2014-03-26 18:38:39 UTC (rev 118229)
@@ -0,0 +1,30 @@
+--- Source/WebCore/platform/audio/FFTFrame.h.orig	2014-01-23 11:33:19.000000000 -0800
++++ Source/WebCore/platform/audio/FFTFrame.h	2014-02-05 17:36:33.000000000 -0800
+@@ -47,13 +47,6 @@
+ #include "mkl_dfti.h"
+ #endif // USE(WEBAUDIO_MKL)
+ 
+-#if USE(WEBAUDIO_GSTREAMER)
+-#include <glib.h>
+-G_BEGIN_DECLS
+-#include <gst/fft/gstfftf32.h>
+-G_END_DECLS
+-#endif // USE(WEBAUDIO_GSTREAMER)
+-
+ #if USE(WEBAUDIO_OPENMAX_DL_FFT)
+ #include "dl/sp/api/armSP.h"
+ #include "dl/sp/api/omxSP.h"
+@@ -63,6 +56,13 @@ struct RDFTContext;
+ 
+ #endif // !USE_ACCELERATE_FFT
+ 
++#if USE(WEBAUDIO_GSTREAMER)
++#include <glib.h>
++G_BEGIN_DECLS
++#include <gst/fft/gstfftf32.h>
++G_END_DECLS
++#endif // USE(WEBAUDIO_GSTREAMER)
++
+ #if USE(WEBAUDIO_IPP)
+ #include <ipps.h>
+ #endif // USE(WEBAUDIO_IPP)

Added: trunk/dports/www/webkit-gtk/files/libedit.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/libedit.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/libedit.patch	2014-03-26 18:38:39 UTC (rev 118229)
@@ -0,0 +1,10 @@
+--- Source/JavaScriptCore/GNUmakefile.am.orig	2014-01-12 11:11:12.000000000 -0800
++++ Source/JavaScriptCore/GNUmakefile.am	2014-01-15 12:33:06.000000000 -0800
+@@ -26,6 +26,7 @@ libjavascriptcoregtk_@WEBKITGTK_API_MAJO
+ 	$(javascriptcore_sources)
+ 
+ libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
++	-ledit \
+ 	-lpthread \
+ 	libWTF.la \
+ 	$(GLIB_LIBS) \

Deleted: trunk/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch	2014-03-26 18:38:25 UTC (rev 118228)
+++ trunk/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch	2014-03-26 18:38:39 UTC (rev 118229)
@@ -1,28 +0,0 @@
---- 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-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
- 	libWTF.la \
--	WebCoreLayer.a \
-+	$(webcore_layer_deps) \
- 	$(CAIRO_LIBS) \
- 	$(FREETYPE_LIBS) \
- 	$(GAMEPAD_LIBS) \

    

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

jeremyhu＠macports.org