[gtk-osx] Update WebKit version to 1.6.1

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-osx] Update WebKit version to 1.6.1
Date: Fri, 13 Jan 2012 23:46:31 +0000 (UTC)
commit 802b1f9694c01eaf80b2043fca63225296737abc
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Jan 6 23:51:29 2012 +0100

    Update WebKit version to 1.6.1

 modulesets-stable/gtk-osx-unsupported.modules      |   20 +-
 patches/webkit-1.1.15.patch                        | 1807 --------------------
 patches/webkit-1.3-disallowctype.patch             |   14 -
 patches/webkit-1.3-platform-cf-stuff.patch         |   22 -
 patches/webkit-1.3-plugins-gtk-PluginView.patch    |   64 -
 patches/webkit-1.6-enable-blob.patch               |   19 +
 ...es.patch => webkit-1.6-missing-icu-files.patch} |    0
 patches/webkit-1.6-missing-utf8-include.patch      |   10 +
 patches/webkit-1.6-no-x11.patch                    |  146 ++
 patches/webkit-1.6-pango-includes.patch            |   24 +
 patches/webkit-disallowctype.patch                 |   14 -
 patches/webkit.patch                               |  944 ----------
 12 files changed, 208 insertions(+), 2876 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index fcc9319..82221f1 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -173,12 +173,13 @@ This issue was closed by revision r827.
   </autotools>
 
   <autotools id="WebKit" autogen-sh="configure"
-	     autogenargs="--with-target=quartz --disable-video --with-font-backend=pango CFLAGS='-DWTF_PLATFORM_CF=1'">
-    <branch repo="webkit.org" module="webkit-1.3.10.tar.gz" version="1.3.10">
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.3-missing-icu-files.patch"; strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.3-disallowctype.patch"; strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.3-plugins-gtk-PluginView.patch"; strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.3-platform-cf-stuff.patch"; strip="1"/>
+	     autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0">
+    <branch repo="webkit.org" module="webkit-1.6.1.tar.gz" version="1.6.1">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-no-x11.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-pango-includes.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-icu-files.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-utf8-include.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="enchant"/>
@@ -188,13 +189,11 @@ This issue was closed by revision r827.
       <dep package="libsoup-gtk3"/>
       <dep package="meta-gtk-osx-core"/>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="libcurl"/>
-      <dep package="bison"/>
     </after>
   </autotools>
 
   <autotools id="WebKit-svn"
-	     autogenargs="--with-target=quartz --disable-video --with-font-backend=pango">
+	     autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=3.0">
     <branch repo="svn.webkit.org" module="webkit/trunk" checkoutdir="WebKit"/>
     <dependencies>
       <dep package="libsoup-gtk3"/>
@@ -203,8 +202,7 @@ This issue was closed by revision r827.
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-core"/>
-      <dep package="libcurl"/>
-      <dep package="bison"/>
+      <dep package="meta-gtk-osx-gtk3"/>
       <!--dep package="gst-plugins-base"/-->
     </after>
   </autotools>
diff --git a/patches/webkit-1.6-enable-blob.patch b/patches/webkit-1.6-enable-blob.patch
new file mode 100644
index 0000000..5ea08d2
--- /dev/null
+++ b/patches/webkit-1.6-enable-blob.patch
@@ -0,0 +1,19 @@
+Compiling with --disable-blob is broken; this fixes it.
+
+--- a/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp	2012-01-06 19:24:11.000000000 +0100
++++ b/Source/WebCore/bindings/gobject/WebKitDomCustom.cpp	2012-01-06 19:24:17.000000000 +0100
+@@ -42,12 +42,14 @@
+     return core(input)->lastChangeWasUserEdit();
+ }
+ 
++#ifdef ENABLE_BLOB
+ /* Compatibility */
+ WebKitDOMBlob*
+ webkit_dom_blob_slice(WebKitDOMBlob* self, gint64 start, gint64 end, const gchar* content_type)
+ {
+     return webkit_dom_blob_webkit_slice(self, start, end, content_type);
+ }
++#endif ENABLE_BLOB
+ 
+ void
+ webkit_dom_html_form_element_dispatch_form_change(WebKitDOMHTMLFormElement* self)
diff --git a/patches/webkit-1.3-missing-icu-files.patch b/patches/webkit-1.6-missing-icu-files.patch
similarity index 100%
rename from patches/webkit-1.3-missing-icu-files.patch
rename to patches/webkit-1.6-missing-icu-files.patch
diff --git a/patches/webkit-1.6-missing-utf8-include.patch b/patches/webkit-1.6-missing-utf8-include.patch
new file mode 100644
index 0000000..1b6a166
--- /dev/null
+++ b/patches/webkit-1.6-missing-utf8-include.patch
@@ -0,0 +1,10 @@
+--- a/Source/WebCore/platform/text/TextCodecUTF8.h	2012-01-05 22:21:07.000000000 +0100
++++ b/Source/WebCore/platform/text/TextCodecUTF8.h	2012-01-05 22:23:39.000000000 +0100
+@@ -27,6 +27,7 @@
+ #define TextCodecUTF8_h
+ 
+ #include "TextCodec.h"
++#include <icu/unicode/utf8.h>
+ 
+ namespace WebCore {
+ 
diff --git a/patches/webkit-1.6-no-x11.patch b/patches/webkit-1.6-no-x11.patch
new file mode 100644
index 0000000..473490d
--- /dev/null
+++ b/patches/webkit-1.6-no-x11.patch
@@ -0,0 +1,146 @@
+--- a/configure.ac	2012-01-05 19:31:13.000000000 +0100
++++ b/configure.ac	2012-01-05 19:31:46.000000000 +0100
+@@ -1015,14 +1015,6 @@
+     AC_SUBST([GEOCLUE_LIBS])
+ fi
+ 
+-# check for XRender under Linux/Unix. Some linkers require explicit
+-# linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender
+-if test "$os_win32" = "no"; then
+-   PKG_CHECK_MODULES([XRENDER], [xrender])
+-   AC_SUBST([XRENDER_CFLAGS])
+-   AC_SUBST([XRENDER_LIBS])
+-fi
+-
+ # check if gstreamer is available
+ if test "$enable_video" = "yes"; then
+    PKG_CHECK_MODULES([GSTREAMER],
+--- a/configure	2012-01-05 18:24:01.000000000 +0100
++++ b/configure	2012-01-05 18:25:43.000000000 +0100
+@@ -22001,104 +22001,6 @@
+ 
+ fi
+ 
+-# check for XRender under Linux/Unix. Some linkers require explicit
+-# linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender
+-if test "$os_win32" = "no"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRENDER" >&5
+-$as_echo_n "checking for XRENDER... " >&6; }
+-
+-if test -n "$XRENDER_CFLAGS"; then
+-    pkg_cv_XRENDER_CFLAGS="$XRENDER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xrender") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "xrender" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XRENDER_LIBS"; then
+-    pkg_cv_XRENDER_LIBS="$XRENDER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xrender") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XRENDER_LIBS=`$PKG_CONFIG --libs "xrender" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XRENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrender" 2>&1`
+-        else
+-	        XRENDER_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrender" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XRENDER_PKG_ERRORS" >&5
+-
+-	as_fn_error $? "Package requirements (xrender) were not met:
+-
+-$XRENDER_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables XRENDER_CFLAGS
+-and XRENDER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables XRENDER_CFLAGS
+-and XRENDER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
+-else
+-	XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS
+-	XRENDER_LIBS=$pkg_cv_XRENDER_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-
+-
+-fi
+-
+ # check if gstreamer is available
+ if test "$enable_video" = "yes"; then
+ 
+--- a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp	2012-01-05 18:26:05.000000000 +0100
++++ b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp	2012-01-05 18:26:18.000000000 +0100
+@@ -70,6 +70,8 @@
+ #endif
+ #include <gtk/gtk.h>
+ 
++#undef XP_UNIX
++
+ #if defined(XP_UNIX)
+ #include "RefPtrCairo.h"
+ #include "gtk2xtbin.h"
+--- a/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp	2012-01-05 23:27:42.000000000 +0100
++++ b/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp	2012-01-05 23:30:56.000000000 +0100
+@@ -19,6 +19,8 @@
+ #include "config.h"
+ #include "WidgetBackingStore.h"
+ 
++#undef XP_UNIX
++
+ #ifdef XP_UNIX
+ 
+ #include "GtkVersioning.h"
diff --git a/patches/webkit-1.6-pango-includes.patch b/patches/webkit-1.6-pango-includes.patch
new file mode 100644
index 0000000..9742ca5
--- /dev/null
+++ b/patches/webkit-1.6-pango-includes.patch
@@ -0,0 +1,24 @@
+--- a/Source/WebCore/GNUmakefile.am	2012-01-05 19:13:38.000000000 +0100
++++ b/Source/WebCore/GNUmakefile.am	2012-01-05 19:13:40.000000000 +0100
+@@ -135,7 +135,8 @@
+ if USE_PANGO
+ webcoregtk_cppflags += \
+ 	-DWTF_USE_PANGO=1 \
+-	-I$(srcdir)/Source/WebCore/platform/graphics/pango
++	-I$(srcdir)/Source/WebCore/platform/graphics/pango \
++	$(PANGO_CFLAGS)
+ endif # END USE_PANGO
+ 
+ # ----
+--- a/GNUmakefile.in	2012-01-05 19:29:36.000000000 +0100
++++ b/GNUmakefile.in	2012-01-05 19:15:25.000000000 +0100
+@@ -1010,7 +1010,8 @@
+ # ---
+ @USE_PANGO_TRUE am__append_42 = \
+ @USE_PANGO_TRUE@	-DWTF_USE_PANGO=1 \
+- USE_PANGO_TRUE@	-I$(srcdir)/Source/WebCore/platform/graphics/pango
++ USE_PANGO_TRUE@	-I$(srcdir)/Source/WebCore/platform/graphics/pango \
++ USE_PANGO_TRUE@	$(PANGO_CFLAGS)
+ 
+ 
+ # ----
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]