GNOME.org
 

[gtk-osx] Restore the module for WebKit-1.6 for Leopard compatibility.

commit 71b57a07b808222a5b5c59737a00272a96c2ddde
Author: John Ralls <jralls ceridwen us>
Date:   Sun Mar 29 11:37:38 2015 -0700

    Restore the module for WebKit-1.6 for Leopard compatibility.

 modulesets-stable/gtk-osx-unsupported.modules   |   35 ++
 modulesets-unstable/gtk-osx-unsupported.modules |    2 -
 modulesets/gtk-osx-unsupported.modules          |    2 +
 patches/patch status                            |   14 +-
 patches/webkit-1.6-clang-fixup.patch            |   35 ++
 patches/webkit-1.6-enable-blob.patch            |   19 +
 patches/webkit-1.6-gnome-3.6-fixup.patch        |  523 +++++++++++++++++++++++
 patches/webkit-1.6-missing-utf8-include.patch   |   10 +
 patches/webkit-1.6-no-x11.patch                 |  146 +++++++
 patches/webkit-1.6-out-of-source-fixup.patch    |   18 +
 patches/webkit-1.6-pango-includes.patch         |   24 +
 11 files changed, 816 insertions(+), 12 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index f92bb79..7fcff51 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -44,6 +44,14 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gtk-osx-webkit1.6">
+    <dependencies>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="libsoup"/>
+      <dep package="WebKit1.6"/>
+    </dependencies>
+  </metamodule>
+
   <metamodule id="meta-gtk-osx-webkit-gtk3">
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -229,6 +237,33 @@
     <after>
       <dep package="meta-gtk-osx-core"/>
       <dep package="meta-gstreamer-1.0"/>
+      <dep package="meta-gtk-osx-gtk3"/>
+    </after>
+  </autotools>
+
+  /* WebKit 1.10 doesn't build with the 10.5 SDK, so use this older version for old builds. */
+  <autotools id="WebKit1.6" autogen-sh="configure"
+            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-utf8-include.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-clang-fixup.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-out-of-source-fixup.patch"; 
strip="1"/>
+
+    </branch>
+    <dependencies>
+      <dep package="enchant"/>
+      <dep package="icu"/>
+      <dep package="libsoup"/>
+      <dep package="meta-gtk-osx-freetype"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gstreamer-1.0"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 783770f..a0f8993 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -20,8 +20,6 @@
               tags-template="tags/%(tag)s"/>
   <repository type="svn" name="svn.webkit.org"
              href="http://svn.webkit.org/repository/"/>
-  <repository type="tarball" name="webkit.org"
-              href="http://www.webkitgtk.org/releases/"/>
   <repository type="git" name="git.webkit.org"
              href="git://git.webkit.org/"/>
   <repository type="git" name="git.debian.org" href="git://git.debian.org/"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index b7dc092..115646e 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -28,6 +28,8 @@
               href="https://git.lysator.liu.se/"/>
   <repository type="git" name="gitorious" href="git://gitorious.org/"/>
   <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
+  <repository type='tarball' name='icu'
+             href='http://download.icu-project.org/files/'/>
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
diff --git a/patches/patch status b/patches/patch status
index 81d9038..69c7c9d 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -28,16 +28,10 @@ libunique:  libunique-663913-sockaddr-un.patch No Love from maintainer
 pygtk:         pygtk-libtool.patch: The PyGtk-2.24.0 tarball uses an argument
                export-symbols-regex, which llvm-gcc doesn't seem to like.
 
-Webkit:                webkit-1.10-no-x11.patch
-               webkit-88407-portable-echo-n.patch
-                       Remove a few uses of "echo -n" that sh can't handle. This
-                       is a slightly different patch than the one at the bug, because
-                       that one doesn't apply.
-                       https://bugs.webkit.org/show_bug.cgi?id=88407
-               webkit-1.10-platform-fixes.patch
-                       some combinations of PLATFORM(GTK) and non-X11 not anticipated
-                       See also https://bugs.webkit.org/show_bug.cgi?id=58737
-               webkit-1.10-pango-includes.patch
+Webkit:                Webkit-1.6-enable-blob.patch
+               webkit-1.6-missing-utf8-include.patch
+               webkit-1.6-no-x11.patch
+               webkit-1.6-pango-includes.patch
 
 webkit1gtk:    webkit-126324-clang-check.patch
                        https://bugs.webkit.org/show_bug.cgi?id=126324
diff --git a/patches/webkit-1.6-clang-fixup.patch b/patches/webkit-1.6-clang-fixup.patch
new file mode 100644
index 0000000..a27147e
--- /dev/null
+++ b/patches/webkit-1.6-clang-fixup.patch
@@ -0,0 +1,35 @@
+--- a/Source/JavaScriptCore/heap/Handle.h      2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/heap/Handle.h      2013-11-23 13:53:03.000000000 -0800
+@@ -113,7 +113,7 @@
+
+ template <typename T> class Handle : public HandleBase, public HandleConverter<Handle<T>, T> {
+ public:
+-    template <typename A, typename B> friend class HandleConverter;
++    template <typename A, typename B> friend struct HandleConverter;
+     typedef typename HandleTypes<T>::ExternalType ExternalType;
+     template <typename U> Handle(Handle<U> o)
+     {
+--- a/Source/JavaScriptCore/wtf/NullPtr.h      2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/wtf/NullPtr.h      2013-11-23 12:59:36.000000000 -0800
+@@ -46,7 +46,9 @@
+ namespace std {
+     class nullptr_t { };
+ }
+-
++#if defined nullptr
++#undef nullptr
++#endif
+ extern std::nullptr_t nullptr;
+
+ #endif
+--- a/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h    2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h    2014-01-05 16:59:44.000000000 -0800
+@@ -32,7 +32,7 @@
+
+ namespace WebCore {
+
+-class GraphicsContextState;
++struct GraphicsContextState;
+
+ // Much like PlatformContextSkia in the Skia port, this class holds information that
+ // would normally be private to GraphicsContext, except that we want to allow access
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.6-gnome-3.6-fixup.patch b/patches/webkit-1.6-gnome-3.6-fixup.patch
new file mode 100644
index 0000000..20e3bff
--- /dev/null
+++ b/patches/webkit-1.6-gnome-3.6-fixup.patch
@@ -0,0 +1,523 @@
+--- a/configure.ac     2012-11-01 13:21:40.000000000 -0700
++++ b/configure.ac     2012-11-01 15:10:37.000000000 -0700
+@@ -321,7 +321,7 @@
+    AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB])
+ else
+    PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
+-   PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION)
++   PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION, gdk-pixbuf-2.0)
+ 
+    if test "$with_target" = "x11" && test "$os_win32" = "no"; then
+       # check for XT
+--- a/Source/autotools/webkit.m4       2011-09-26 13:55:03.000000000 -0700
++++ b/Source/autotools/webkit.m4       2014-02-15 16:49:07.000000000 -0800
+@@ -67,7 +67,7 @@
+
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_PROG_CXX])
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_SYS_LARGEFILE
+--- a/Source/JavaScriptCore/GNUmakefile.am     2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/GNUmakefile.am     2012-11-02 13:23:15.000000000 -0700
+@@ -72,6 +72,7 @@
+ javascriptcore_cflags += \
+       $(global_cflags) \
+       $(GLIB_CFLAGS) \
++      $(GTK_CFLAGS) \
+       $(UNICODE_CFLAGS)
+ 
+ pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk- WEBKITGTK_API_VERSION@.pc
+@@ -105,6 +106,7 @@
+       -ansi \
+       -fno-strict-aliasing \
+       $(global_cflags) \
++      $(javascriptcore_cflags) \
+       $(GLOBALDEPS_CFLAGS)
+ 
+ Programs_minidom_LDADD = \
+@@ -132,6 +134,7 @@
+       -fno-strict-aliasing \
+       $(global_cxxflags) \
+       $(global_cflags) \
++      $(javascriptcore_cflags)\
+       $(GLOBALDEPS_CFLAGS) \
+       $(UNICODE_CFLAGS)
+ 
+--- a/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp   2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp   2012-11-02 13:50:33.000000000 -0700
+@@ -58,8 +58,8 @@
+ 
+ void initializeThreading()
+ {
+-    if (!g_thread_supported())
+-        g_thread_init(NULL);
++/*    if (!g_thread_supported())
++        g_thread_init(NULL); Not required after glib-2.32 */
+     ASSERT(g_thread_supported());
+ 
+     if (!atomicallyInitializedStaticMutex) {
+--- a/Source/JavaScriptCore/wtf/Platform.h     2011-09-26 13:54:57.000000000 -0700
++++ b/Source/JavaScriptCore/wtf/Platform.h     2012-11-01 14:17:38.000000000 -0700
+@@ -1120,7 +1120,10 @@
+ #endif
+ 
+ #if ENABLE(GLIB_SUPPORT)
+-#include "GTypedefs.h"
++#include <glib.h>
++#include <gtk-2.0/gtk/gtk.h>
++#include <gtk-2.0/gdk/gdk.h>
++#include <gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h>
+ #endif
+ 
+ /* FIXME: This define won't be needed once #27551 is fully landed. However, 
+--- a/Source/WebCore/bridge/npruntime_internal.h       2011-09-26 13:54:59.000000000 -0700
++++ b/Source/WebCore/bridge/npruntime_internal.h       2012-11-01 14:58:09.000000000 -0700
+@@ -29,7 +29,7 @@
+ #include "npfunctions.h"
+ #include "npruntime.h"
+ 
+-#ifdef XP_UNIX
++#ifdef XP_X11
+     #include <X11/Xresource.h>
+ 
+     #undef None
+--- a/Source/WebCore/GNUmakefile.am    2012-11-01 13:21:40.000000000 -0700
++++ b/Source/WebCore/GNUmakefile.am    2012-11-01 16:25:42.000000000 -0700
+@@ -771,6 +771,7 @@
+       $(ENCHANT_CFLAGS) \
+       $(GEOCLUE_CFLAGS) \
+       $(GLIB_CFLAGS) \
++      $(GTK_CFLAGS) \
+       $(GSTREAMER_CFLAGS) \
+       $(LIBSOUP_CFLAGS) \
+       $(LIBXML_CFLAGS) \
+--- a/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp  2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp  2012-11-02 12:42:03.000000000 -0700
+@@ -103,7 +103,7 @@
+ #endif
+ }
+ 
+-#if defined(XP_UNIX)
++#if defined(XP_X11)
+ static int webkitgtkXError(Display* xdisplay, XErrorEvent* error)
+ {
+     gchar errorMessage[64];
+@@ -152,7 +152,7 @@
+ 
+     m_isLoaded = true;
+ 
+-#if defined(XP_UNIX)
++#if defined(XP_X11)
+     if (!g_strcmp0(baseName.get(), "libflashplayer.so")) {
+         // Flash plugin can produce X errors that are handled by the GDK X error handler, which
+         // exits the process. Since we don't want to crash due to flash bugs, we install a
+--- a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp     2012-11-01 13:21:40.000000000 -0700
++++ b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp     2012-11-02 12:45:36.000000000 -0700
+@@ -691,7 +691,7 @@
+ #endif
+ 
+         case NPNVnetscapeWindow: {
+-            GdkWindow* gdkWindow = 
gtk_widget_get_window(m_parentFrame->view()->hostWindow()->platformPageClient());
++            GdkWindow* G_GNUC_UNUSED gdkWindow = 
gtk_widget_get_window(m_parentFrame->view()->hostWindow()->platformPageClient());
+ #if defined(XP_UNIX)
+             *static_cast<Window*>(value) = GDK_WINDOW_XWINDOW(gdk_window_get_toplevel(gdkWindow));
+ #elif defined(GDK_WINDOWING_WIN32)
+@@ -741,7 +741,7 @@
+         gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
+ }
+ 
+-#ifndef GDK_WINDOWING_WIN32
++#if !defined GDK_WINDOWING_WIN32 && defined XP_X11
+ static Display* getPluginDisplay()
+ {
+     // The plugin toolkit might have a different X connection open.  Since we're
+--- a/Source/WebCore/plugins/npapi.h   2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/plugins/npapi.h   2012-11-01 15:00:25.000000000 -0700
+@@ -89,7 +89,7 @@
+ #endif
+ #endif
+ 
+-#if defined(XP_UNIX)
++#if defined(XP_X11)
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <stdio.h>
+@@ -248,7 +248,7 @@
+ /* Exact meaning must be spec'd in event model. */
+ #define kNPEventStartIME 2
+ 
+-#if defined(XP_UNIX)
++#if defined(XP_X11)
+ /*
+  * Unix specific structures and definitions
+  */
+@@ -541,7 +541,7 @@
+   uint32_t wParam;
+   uint32_t lParam;
+ } NPEvent;
+-#elif defined(XP_UNIX)
++#elif defined(XP_X11)
+ typedef XEvent NPEvent;
+ #else
+ typedef void*  NPEvent;
+@@ -555,7 +555,7 @@
+ typedef CGPathRef NPCGRegion;
+ #elif defined(XP_WIN)
+ typedef HRGN NPRegion;
+-#elif defined(XP_UNIX)
++#elif defined(XP_X11)
+ typedef Region NPRegion;
+ #elif defined(XP_SYMBIAN)
+ typedef QRegion* NPRegion;
+--- a/Source/WebCore/plugins/PluginView.cpp    2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/plugins/PluginView.cpp    2012-11-02 11:35:33.000000000 -0700
+@@ -363,7 +363,7 @@
+         PluginView::setCurrentPluginView(0);
+     }
+ 
+-#ifdef XP_UNIX
++#ifdef XP_X11
+     if (m_isWindowed && m_npWindow.ws_info)
+            delete (NPSetWindowCallbackStruct *)m_npWindow.ws_info;
+     m_npWindow.ws_info = 0;
+@@ -861,7 +861,7 @@
+     , m_contextRef(0)
+     , m_fakeWindow(0)
+ #endif
+-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
++#if defined(XP_X11) && ENABLE(NETSCAPE_PLUGIN_API)
+     , m_hasPendingGeometryChange(true)
+     , m_drawable(0)
+     , m_visual(0)
+--- a/Source/WebCore/plugins/PluginView.h      2011-09-26 13:55:00.000000000 -0700
++++ b/Source/WebCore/plugins/PluginView.h      2012-11-01 15:15:34.000000000 -0700
+@@ -408,7 +408,7 @@
+         Point mousePosForPlugin(MouseEvent* event = 0) const;
+ #endif
+ 
+-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
++#if defined(XP_X11) && ENABLE(NETSCAPE_PLUGIN_API)
+         bool m_hasPendingGeometryChange;
+         Pixmap m_drawable;
+         Visual* m_visual;
+--- a/Source/WebKit/gtk/tests/testapplicationcache.c   2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testapplicationcache.c   2012-11-02 13:31:27.000000000 -0700
+@@ -39,7 +39,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testatk.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testatk.c        2012-11-02 13:40:25.000000000 -0700
+@@ -1660,7 +1660,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(0);
++/*    g_thread_init(0); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, 0);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testatkroles.c   2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testatkroles.c   2012-11-02 13:40:40.000000000 -0700
+@@ -302,7 +302,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testcopyandpaste.c       2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testcopyandpaste.c       2012-11-02 13:41:07.000000000 -0700
+@@ -228,7 +228,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testdomdocument.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testdomdocument.c        2012-11-02 13:41:37.000000000 -0700
+@@ -319,8 +319,8 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    if (!g_thread_supported())
+-        g_thread_init(NULL);
++/*    if (!g_thread_supported())
++        g_thread_init(NULL); Not required after glib-2.32 */
+ 
+     gtk_test_init(&argc, &argv, NULL);
+ 
+--- a/Source/WebKit/gtk/tests/testdomdomwindow.c       2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testdomdomwindow.c       2012-11-02 13:42:00.000000000 -0700
+@@ -197,8 +197,8 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    if (!g_thread_supported())
+-        g_thread_init(NULL);
++/*    if (!g_thread_supported())
++        g_thread_init(NULL); Not required after glib-2.32 */
+ 
+     gtk_test_init(&argc, &argv, NULL);
+ 
+--- a/Source/WebKit/gtk/tests/testdomnode.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testdomnode.c    2012-11-02 13:42:23.000000000 -0700
+@@ -174,8 +174,8 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    if (!g_thread_supported())
+-        g_thread_init(NULL);
++/*    if (!g_thread_supported())
++        g_thread_init(NULL); Not required after glib-2.32 */
+ 
+     gtk_test_init(&argc, &argv, NULL);
+ 
+--- a/Source/WebKit/gtk/tests/testdownload.c   2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testdownload.c   2012-11-02 13:42:42.000000000 -0700
+@@ -250,7 +250,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testglobals.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testglobals.c    2012-11-02 13:43:01.000000000 -0700
+@@ -47,7 +47,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testhittestresult.c      2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testhittestresult.c      2012-11-02 13:43:20.000000000 -0700
+@@ -136,7 +136,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testhttpbackend.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testhttpbackend.c        2012-11-02 13:43:47.000000000 -0700
+@@ -68,7 +68,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testkeyevents.c  2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testkeyevents.c  2012-11-02 13:44:45.000000000 -0700
+@@ -303,7 +303,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testloading.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testloading.c    2012-11-02 13:45:04.000000000 -0700
+@@ -400,7 +400,7 @@
+ {
+     SoupServer* server;
+ 
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
+--- a/Source/WebKit/gtk/tests/testmimehandling.c       2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testmimehandling.c       2012-11-02 13:45:22.000000000 -0700
+@@ -176,7 +176,7 @@
+     SoupServer* server;
+     SoupURI* soup_uri;
+ 
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     /* Hopefully make test independent of the path it's called from. */
+--- a/Source/WebKit/gtk/tests/testnetworkrequest.c     2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testnetworkrequest.c     2012-11-02 13:45:41.000000000 -0700
+@@ -88,7 +88,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testnetworkresponse.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testnetworkresponse.c    2012-11-02 13:45:53.000000000 -0700
+@@ -89,7 +89,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testwebbackforwardlist.c 2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebbackforwardlist.c 2012-11-02 13:47:05.000000000 -0700
+@@ -316,7 +316,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testwebdatasource.c      2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebdatasource.c      2012-11-02 13:47:21.000000000 -0700
+@@ -226,7 +226,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testwebframe.c   2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebframe.c   2012-11-02 13:47:37.000000000 -0700
+@@ -209,7 +209,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testwebhistoryitem.c     2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebhistoryitem.c     2012-11-02 13:47:55.000000000 -0700
+@@ -58,7 +58,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testwebplugindatabase.c  2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebplugindatabase.c  2012-11-02 13:48:20.000000000 -0700
+@@ -71,7 +71,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testwebresource.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebresource.c        2012-11-02 13:48:37.000000000 -0700
+@@ -295,7 +295,7 @@
+     SoupServer* server;
+     SoupURI* soup_uri;
+ 
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
+--- a/Source/WebKit/gtk/tests/testwebsettings.c        2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebsettings.c        2012-11-02 13:48:52.000000000 -0700
+@@ -149,7 +149,7 @@
+ 
+ int main(int argc, char **argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Source/WebKit/gtk/tests/testwebview.c    2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwebview.c    2012-11-02 13:49:09.000000000 -0700
+@@ -368,7 +368,7 @@
+     SoupServer* server;
+     SoupURI* soup_uri;
+ 
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     /* Hopefully make test independent of the path it's called from. */
+--- a/Source/WebKit/gtk/tests/testwindow.c     2011-09-26 13:55:01.000000000 -0700
++++ b/Source/WebKit/gtk/tests/testwindow.c     2012-11-02 13:49:24.000000000 -0700
+@@ -112,7 +112,7 @@
+ 
+ int main(int argc, char** argv)
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_test_init(&argc, &argv, NULL);
+ 
+     g_test_bug_base("https://bugs.webkit.org/";);
+--- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp      2011-09-26 13:55:03.000000000 -0700
++++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp      2012-11-02 14:00:53.000000000 -0700
+@@ -1168,7 +1168,7 @@
+ 
+ int main(int argc, char* argv[])
+ {
+-    g_thread_init(NULL);
++/*    g_thread_init(NULL); Not required after glib-2.32 */
+     gtk_init(&argc, &argv);
+ 
+     // Some plugins might try to use the GLib logger for printing debug
+--- a/Tools/GtkLauncher/main.c 2011-09-26 13:55:03.000000000 -0700
++++ b/Tools/GtkLauncher/main.c 2012-11-02 14:01:23.000000000 -0700
+@@ -88,8 +388,8 @@
+     };
+ 
+     gtk_init(&argc, &argv);
+-    if (!g_thread_supported())
+-        g_thread_init(NULL);
++/*    if (!g_thread_supported())
++        g_thread_init(NULL);  Not required after glib-2.32 */
+ 
+     GOptionContext *context = g_option_context_new(0);
+     g_option_context_add_main_entries(context, commandLineOptions, 0);
+--- a/Tools/MiniBrowser/gtk/main.c     2011-09-26 13:55:03.000000000 -0700
++++ b/Tools/MiniBrowser/gtk/main.c     2012-11-02 14:01:52.000000000 -0700
+@@ -76,8 +76,8 @@
+ 
+ int main(int argc, char *argv[])
+ {
+-    if (!g_thread_supported())
+-        g_thread_init(NULL);
++/*    if (!g_thread_supported())
++        g_thread_init(NULL); Not required after glib-2.32 */
+ 
+     GOptionContext *context = g_option_context_new(NULL);
+     g_option_context_add_main_entries(context, commandLineOptions, 0);
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-out-of-source-fixup.patch b/patches/webkit-1.6-out-of-source-fixup.patch
new file mode 100644
index 0000000..59cf949
--- /dev/null
+++ b/patches/webkit-1.6-out-of-source-fixup.patch
@@ -0,0 +1,18 @@
+--- a/Source/WebKit/gtk/po/GNUmakefile.am      2014-02-15 16:45:30.000000000 -0800
++++ b/Source/WebKit/gtk/po/GNUmakefile.am      2014-02-24 12:21:01.000000000 -0800
+@@ -30,7 +30,6 @@
+ MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
+
+ .po.mo:
+-      test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
+       @echo "$(MSGFMT) -c -o $@ $<"; \
+       $(MSGFMT) -c -o $@ $<
+
+@@ -60,6 +59,7 @@
+ # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+ # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/Source/WebKit/gtk/po/POTFILES
++      test -d $(top_builddir)/Source/WebKit/gtk/po/ || mkdir -p $(top_builddir)/Source/WebKit/gtk/po/
+       package_gnu=''; \
+       if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+         msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
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]