[115517] trunk/dports/www

3 Jan 2014

Revision: 115517
          https://trac.macports.org/changeset/115517
Author:   jeremyhu@macports.org
Date:     2014-01-03 15:35:44 -0800 (Fri, 03 Jan 2014)
Log Message:
-----------
webkit-gtk-devel: New port

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit-gtk-2.0/Portfile

Added Paths:
-----------
    trunk/dports/www/webkit-gtk-devel/
    trunk/dports/www/webkit-gtk-devel/Portfile
    trunk/dports/www/webkit-gtk-devel/files/
    trunk/dports/www/webkit-gtk-devel/files/case-insensitive.patch
    trunk/dports/www/webkit-gtk-devel/files/clang-assertions.patch
    trunk/dports/www/webkit-gtk-devel/files/clang-check.patch
    trunk/dports/www/webkit-gtk-devel/files/execinfo.patch
    trunk/dports/www/webkit-gtk-devel/files/gstreamer.patch
    trunk/dports/www/webkit-gtk-devel/files/libc++.patch
    trunk/dports/www/webkit-gtk-devel/files/our-icu.patch
    trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch
    trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch
    trunk/dports/www/webkit-gtk-devel/files/quartz-webcore.patch

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

--- trunk/dports/www/webkit-gtk/Portfile	2014-01-03 23:00:38 UTC (rev 115516)
+++ trunk/dports/www/webkit-gtk/Portfile	2014-01-03 23:35:44 UTC (rev 115517)
@@ -8,8 +8,7 @@
 
 name        webkit-gtk
 epoch       2
-version     2.2.3
-revision    1
+version     2.3.3
 description Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers jeremyhu devans
@@ -22,9 +21,9 @@
 use_xz      yes
 distname    webkitgtk-${version}
 
-checksums           sha1    57fa31c489e7fd5d405e0753e6e6f15933b143f3 \
-                    rmd160  8e63661e2ac9e91d24588ac5377967190623c44c \
-                    sha256  94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605
+checksums           sha1    30094e23a4cae478cf03f11c12cd29c0bb326cc6 \
+                    rmd160  165727f34786fcbc62a153e97ba40ec0567c93c6 \
+                    sha256  43b779d0c30a1d7af6fb62fcf4e0ed13871edd302317c6acaba7beb9c8157b1e
 
 depends_lib \
         path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -100,7 +99,7 @@
 }
 
 subport webkit-gtk3 {
-    conflicts   webkit-gtk3-2.0
+    conflicts   webkit-gtk3-2.0 webkit-gtk3-devel
     depends_lib-append      port:gtk3
     configure.args-append   --with-gtk=3.0
 
@@ -131,7 +130,7 @@
 }
 
 if {${name} eq ${subport}} {
-    conflicts   webkit-gtk-2.0
+    conflicts   webkit-gtk-2.0 webkit-gtk-devel
     depends_lib-append      port:gtk2
     configure.args-append   --with-gtk=2.0
 }

Modified: trunk/dports/www/webkit-gtk-2.0/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/Portfile	2014-01-03 23:00:38 UTC (rev 115516)
+++ trunk/dports/www/webkit-gtk-2.0/Portfile	2014-01-03 23:35:44 UTC (rev 115517)
@@ -83,7 +83,7 @@
         --enable-webgl
 
 subport webkit-gtk3-2.0 {
-    conflicts   webkit-gtk3
+    conflicts   webkit-gtk3 webkit-gtk3-devel
 
     depends_lib-append      port:gtk3
     configure.args-append   --with-gtk=3.0
@@ -115,7 +115,7 @@
 }
 
 if {${name} eq ${subport}} {
-    conflicts   webkit-gtk
+    conflicts   webkit-gtk webkit-gtk-devel
 
     depends_lib-append      port:gtk2
     configure.args-append   --with-gtk=2.0

Added: trunk/dports/www/webkit-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk-devel/Portfile	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/Portfile	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,257 @@
+# -*- 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$
+
+PortSystem  1.0
+PortGroup   conflicts_build 1.0
+PortGroup   muniversal 1.0
+PortGroup   compiler_blacklist_versions 1.0
+
+name        webkit-gtk-devel
+epoch       2
+version     2.3.3
+description Apple's WebKit HTML rendering library for GTK+
+long_description ${description}
+maintainers jeremyhu devans
+categories  www gnome
+platforms   darwin freebsd
+license     LGPL-2+ BSD
+homepage    http://webkitgtk.org/
+master_sites    http://webkitgtk.org/releases/
+
+use_xz      yes
+distname    webkitgtk-${version}
+
+dist_subdir webkit-gtk
+
+checksums           sha1    30094e23a4cae478cf03f11c12cd29c0bb326cc6 \
+                    rmd160  165727f34786fcbc62a153e97ba40ec0567c93c6 \
+                    sha256  43b779d0c30a1d7af6fb62fcf4e0ed13871edd302317c6acaba7beb9c8157b1e
+
+depends_lib \
+        path:lib/pkgconfig/glib-2.0.pc:glib2 \
+        port:bison \
+        port:flex \
+        port:enchant \
+        port:geoclue \
+        port:gobject-introspection \
+        port:harfbuzz-icu \
+        port:libxslt \
+        port:libpng \
+        port:libsecret \
+        port:libsoup \
+        port:mesa \
+        port:sqlite3 \
+        port:webp \
+        port:xorg-libXt
+
+depends_build   \
+        port:gtk-doc \
+        port:pkgconfig
+
+# case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
+# our-icu.patch: No upstream bug report, probably not wanted
+# execinfo.patch: https://trac.macports.org/ticket/37882
+# quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
+# clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
+# libc++.patch: https://bugs.webkit.org/show_bug.cgi?id=126431
+# gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
+
+patchfiles \
+        clang-assertions.patch \
+        case-insensitive.patch \
+        our-icu.patch \
+        execinfo.patch \
+        quartz-webcore.patch \
+        clang-check.patch \
+        libc++.patch \
+        gstreamer.patch
+
+conflicts_build     google-test
+
+# https://trac.macports.org/ticket/36329
+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 \
+        --enable-geolocation \
+        --enable-webgl
+
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
+platform darwin {
+    pre-configure {
+        set cxxstdlib {}
+
+        if {[info exists configure.cxx_stdlib] &&
+            ${configure.cxx_stdlib} ne {} &&
+            [string match *clang* ${configure.cxx}]} {
+            set cxxstdlib ${configure.cxx_stdlib}
+        } elseif {[string match *clang* ${configure.cxx}] &&
+                  ${os.major} >= 13} {
+            set cxxstdlib libc++
+        } else {
+            set cxxstdlib libstdc++
+        }
+
+        if {${cxxstdlib} eq "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-devel {
+    conflicts   webkit-gtk3 webkit-gtk3-2.0
+    depends_lib-append      port:gtk3
+    configure.args-append   --with-gtk=3.0
+
+#
+# move gtk-docs to allow parallel install with webkit-gtk
+#
+    if {[variant_isset universal]} {
+#
+# using diff to merge derived include files sometimes
+# results in a corrupted file due to nested /* */ blocks
+#
+        global merger_dont_diff
+        set merger_dont_diff    "${prefix}/include/webkitgtk-3.0/webkitdom/WebKitDOMNavigator.h"
+        merger-post-destroot {
+            foreach arch ${universal_archs_to_use} {
+                set docpath ${workpath}/destroot-${arch}${prefix}/share/gtk-doc/html
+                move ${docpath}/webkitgtk ${docpath}/webkitgtk3
+                move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
+            }
+        }
+    } else {
+        post-destroot {
+           set docpath ${destroot}${prefix}/share/gtk-doc/html
+           move ${docpath}/webkitgtk ${docpath}/webkitgtk3
+           move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
+        }
+    }
+}
+
+if {${name} eq ${subport}} {
+    conflicts   webkit-gtk webkit-gtk-2.0
+    depends_lib-append      port:gtk2
+    configure.args-append   --with-gtk=2.0
+}
+
+# https://bugs.webkit.org/show_bug.cgi?id=94488
+configure.universal_args-delete --disable-dependency-tracking
+
+# configure checks that we're clang 3.2, 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 < 425} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1
+
+# gobject-introspection uses g-ir-scanner, which uses $CC from env
+if {[variant_isset universal]} {
+    foreach arch ${configure.universal_archs} {
+        lappend merger_build_args(${arch})     CC='${configure.cc} -arch ${arch}'
+        lappend merger_destroot_args(${arch})  CC='${configure.cc} -arch ${arch}'
+    }
+} else {
+    build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
+    destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
+}
+
+# We don't want to use the headers from the installed WebKit
+configure.cppflags-delete -I${prefix}/include
+
+# 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 -fvi
+
+lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
+
+post-patch {
+    # 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=88407
+    # Fixed in master, should be removed in 2.3.4
+    reinplace "s:echo -n:/bin/echo -n:g" \
+        ${worksrcpath}/Source/WebCore/GNUmakefile.am
+
+    # https://bugs.webkit.org/show_bug.cgi?id=99683
+    reinplace "s:PLATFORM(MAC):OS(DARWIN):g" \
+        ${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
+
+    # https://bugs.webkit.org/show_bug.cgi?id=126325
+    reinplace "s:-stdlib=libstdc\+\+::" \
+        ${worksrcpath}/Source/autotools/SetupCompilerFlags.m4
+
+    # https://bugs.webkit.org/show_bug.cgi?id=126329
+    # 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
+# keep it for debug
+#post-destroot {
+#    file copy ${worksrcpath}/Programs/.libs/GtkLauncher ${destroot}${prefix}/bin
+#}
+
+# I'm not sure if this is needed or for what versions of make.  I just hit a snag and this
+# may have fixed it, or it may have been a 1-off issue, or I may have been impatient.
+# TODO: Remove?
+depends_build-append port:gmake
+build.cmd ${prefix}/bin/gmake
+
+build.args-append V=1
+
+# see bug #24622
+variant quartz {
+    configure.args-append --with-target=quartz
+
+    # TODO: See if this will build with OpenGL.framework
+    configure.args-delete --enable-webgl
+    depends_lib-delete \
+        port:mesa \
+        port:xorg-libXt
+
+    # quartz-include-widgetbackingstorecairo.patch
+    # https://trac.macports.org/ticket/38203
+    # https://bugs.webkit.org/show_bug.cgi?id=111598
+    patchfiles-append quartz-duplicate-symbols.patch \
+                      quartz-include-widgetbackingstorecairo.patch
+}
+
+variant video description {Enable HTML5 video support using gstreamer} {
+        depends_lib-append      port:gstreamer1-gst-plugins-base
+        configure.args-delete   --disable-video
+        configure.args-append   --enable-video
+}
+
+default_variants +video
+
+if {[string match *clang* ${configure.cxx}]} {
+    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\]+)


Property changes on: trunk/dports/www/webkit-gtk-devel/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/www/webkit-gtk-devel/files/case-insensitive.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/case-insensitive.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/case-insensitive.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,13 @@
+--- Source/WebCore/platform/text/TextCodecUTF8.h.orig	2012-04-12 17:24:24.000000000 -0700
++++ Source/WebCore/platform/text/TextCodecUTF8.h	2012-04-12 17:46:05.000000000 -0700
+@@ -28,6 +28,9 @@
+ 
+ #include "TextCodec.h"
+ 
++/* https://bugs.webkit.org/show_bug.cgi?id=65811 */
++#include "../../../JavaScriptCore/icu/unicode/utf8.h"
++
+ namespace WebCore {
+ 
+ class TextCodecUTF8 : public TextCodec {
+

Added: trunk/dports/www/webkit-gtk-devel/files/clang-assertions.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/clang-assertions.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/clang-assertions.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,12 @@
+--- Source/WTF/wtf/Assertions.h.orig	2013-01-18 15:03:57.000000000 -0800
++++ Source/WTF/wtf/Assertions.h	2013-01-18 15:04:46.000000000 -0800
+@@ -381,7 +381,8 @@ while (0)
+ // a function. Hence it uses macro naming convention.
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wmissing-noreturn"
+-static inline void UNREACHABLE_FOR_PLATFORM()
++__attribute__ ((__always_inline__))
++static __inline__ void UNREACHABLE_FOR_PLATFORM()
+ {
+     ASSERT_NOT_REACHED();
+ }

Added: trunk/dports/www/webkit-gtk-devel/files/clang-check.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/clang-check.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/clang-check.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -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++"], [])

Added: trunk/dports/www/webkit-gtk-devel/files/execinfo.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/execinfo.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/execinfo.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,35 @@
+diff -Naurp webkitgtk-1.10.2.orig/Source/JavaScriptCore/tools/CodeProfile.cpp webkitgtk-1.10.2/Source/JavaScriptCore/tools/CodeProfile.cpp
+--- Source/JavaScriptCore/tools/CodeProfile.cpp	2013-01-31 22:39:07.000000000 -0800
++++ Source/JavaScriptCore/tools/CodeProfile.cpp	2013-01-31 22:42:01.000000000 -0800
+@@ -36,7 +36,6 @@
+ #if OS(DARWIN)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+-#include <execinfo.h>
+ #endif
+ 
+ namespace JSC {
+diff -Naurp webkitgtk-1.10.2.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-1.10.2/Source/WTF/wtf/Assertions.cpp
+--- Source/WTF/wtf/Assertions.cpp	2012-11-23 12:12:16.000000000 -0800
++++ Source/WTF/wtf/Assertions.cpp	2013-01-31 22:43:57.000000000 -0800
+@@ -61,8 +61,11 @@
+ #if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
++#include <AvailabilityMacros.h>
++#if !OS(DARWIN) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
+ #include <execinfo.h>
+ #endif
++#endif
+ 
+ #if OS(ANDROID)
+ #include "android/log.h"
+@@ -242,7 +245,7 @@ void WTFReportArgumentAssertionFailure(c
+ 
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+-#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-devel/files/gstreamer.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/gstreamer.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/gstreamer.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,43 @@
+--- Source/WebCore/platform/audio/FFTFrame.h.orig	2013-12-04 23:27:01.000000000 -0800
++++ Source/WebCore/platform/audio/FFTFrame.h	2014-01-03 10:07:42.000000000 -0800
+@@ -39,31 +39,27 @@
+ 
+ #if USE_ACCELERATE_FFT
+ #include <Accelerate/Accelerate.h>
+-#endif
+-
+-#if !USE_ACCELERATE_FFT
+-
++#else
+ #if USE(WEBAUDIO_MKL)
+ #include "mkl_dfti.h"
+ #endif // USE(WEBAUDIO_MKL)
+ 
+-#if USE(WEBAUDIO_GSTREAMER)
+-#include <glib.h>
+-#include <memory>
+-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"
+ #elif USE(WEBAUDIO_FFMPEG)
+ struct RDFTContext;
+ #endif
+-
+ #endif // !USE_ACCELERATE_FFT
+ 
++#if USE(WEBAUDIO_GSTREAMER)
++#include <glib.h>
++#include <memory>
++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-devel/files/libc++.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/libc++.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/libc++.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,17 @@
+--- Source/autotools/CheckSystemAndBasicDependencies.m4.orig	2014-01-03 08:55:20.000000000 -0800
++++ Source/autotools/CheckSystemAndBasicDependencies.m4	2014-01-03 08:57:19.000000000 -0800
+@@ -123,14 +123,6 @@ elif test "$cxx_compiler" = "clang++"; t
+     OLD_CXXFLAGS="$CXXFLAGS"
+     CXXFLAGS="-std=c++11"
+     AC_LANG_PUSH([C++])
+-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+-#include <type_traits>
+-#if defined(__GLIBCXX__) && __GLIBCXX__ >= 20130531
+-bool libstdcxxTest = std::is_trivially_destructible<bool>::value;
+-#else
+-#error libstdc++ >= 4.8.1 is required
+-#endif
+-])], [], [AC_MSG_ERROR([libstdc++ >= 4.8.1 is required as the standard library used with the Clang compiler.])])
+     AC_LANG_POP([C++])
+     CXXFLAGS="$OLD_CXXFLAGS"
+ fi

Added: trunk/dports/www/webkit-gtk-devel/files/our-icu.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/our-icu.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/our-icu.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,13 @@
+--- Source/autotools/FindDependencies.m4.orig	2013-03-07 19:18:41.000000000 -0800
++++ Source/autotools/FindDependencies.m4	2013-03-07 19:18:48.000000000 -0800
+@@ -108,10 +108,6 @@ GLIB_GSETTINGS
+ 
+ # TODO: use pkg-config (after CFLAGS in their .pc files are cleaned up).
+ case "$host" in
+-    *-*-darwin*)
+-        UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
+-        UNICODE_LIBS="-licucore"
+-        ;;
+     *-*-mingw*)
+         UNICODE_CFLAGS=""
+         UNICODE_LIBS="-licui18n -licuuc"

Added: trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,13 @@
+--- Source/WebCore/plugins/PluginPackageNone.cpp.orig	2012-10-29 20:40:46.000000000 -0400
++++ Source/WebCore/plugins/PluginPackageNone.cpp	2012-10-29 20:40:46.000000000 -0400
+@@ -28,10 +28,6 @@
+ 
+ namespace WebCore {
+ 
+-void PluginPackage::determineQuirks(const String&)
+-{
+-}
+-
+ bool PluginPackage::fetchInfo()
+ {
+     return false;

Added: trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,12 @@
+--- Source/WebCore/GNUmakefile.list.am.old	2013-02-24 19:01:51.000000000 +0100
++++ Source/WebCore/GNUmakefile.list.am	2013-02-24 19:03:41.000000000 +0100
+@@ -5949,6 +5949,9 @@
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++# in quartz mode include cairo widgetbackingstore implementation also
++webcoregtk_sources += \
++	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
+ endif # END TARGET_WIN32
+ endif # END TARGET_X11
+ 

Added: trunk/dports/www/webkit-gtk-devel/files/quartz-webcore.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/quartz-webcore.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-webcore.patch	2014-01-03 23:35:44 UTC (rev 115517)
@@ -0,0 +1,22 @@
+--- 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 @@
+     , m_contextRef(0)
+     , m_fakeWindow(0)
+ #endif
+-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
++#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+     , m_hasPendingGeometryChange(true)
+     , m_drawable(0)
+     , m_visual(0)
+--- Source/WebCore/plugins/PluginView-orig.h	2013-07-19 00:04:11.000000000 -0700
++++ Source/WebCore/plugins/PluginView.h	2013-08-12 16:09:21.000000000 -0700
+@@ -427,7 +427,7 @@
+         Point mousePosForPlugin(MouseEvent* event = 0) const;
+ #endif
+ 
+-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
++#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+         bool m_hasPendingGeometryChange;
+         Pixmap m_drawable;
+         Visual* m_visual;

    

[115517] trunk/dports/www

jeremyhu＠macports.org