[jhbuild] [3.0] Patch WebKit-1.3.7 required to build with gtk+3 (GNOME bug 636595)

[Craig Keogh <cskeogh src gnome org>]

commit f5de86d09724fd7d542e7b03d26bef61d1abd33f
Author: Craig Keogh <cskeogh adam com au>
Date:   Fri Dec 10 20:44:22 2010 +1030

    [3.0] Patch WebKit-1.3.7 required to build with gtk+3 (GNOME bug 636595)
    
    Patch based upon work by Florian Gawrilowicz.

 modulesets/gnome-suites-core-deps-3.0.modules |    4 +-
 patches/WebKit-1.3.7-changeset_r73603.diff    |   53 +++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index f65dfc6..2b6a4f9 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -1176,9 +1176,11 @@
             module="webkit-1.3.7.tar.gz" version="1.3.7"
             hash="sha256:937c75610108d09f9ac35aa120937cb193bc78a409c5fbfc439930a65a054652"
             md5sum="134a799199d633899f4bb54b11e966e6" size="9797065">
-      <!-- patch needed to build with gtk3, remove when 1.3.8 released -->
+      <!-- 2 patches needed to build with gtk3, remove when 1.3.8 released -->
       <!-- see http://trac.webkit.org/changeset/73330 -->
       <patch file="WebKit-1.3.7-changeset_r73330.diff" strip="2"/>
+      <!-- http://trac.webkit.org/changeset/73603 -->
+      <patch file="WebKit-1.3.7-changeset_r73603.diff" strip="2"/>
     </branch>
     <dependencies>
       <dep package="cairo"/>
diff --git a/patches/WebKit-1.3.7-changeset_r73603.diff b/patches/WebKit-1.3.7-changeset_r73603.diff
new file mode 100644
index 0000000..378b733
--- /dev/null
+++ b/patches/WebKit-1.3.7-changeset_r73603.diff
@@ -0,0 +1,53 @@
+Index: /trunk/WebCore/plugins/gtk/gtk2xtbin.c
+===================================================================
+--- /trunk/WebCore/plugins/gtk/gtk2xtbin.c	(revision 70677)
++++ /trunk/WebCore/plugins/gtk/gtk2xtbin.c	(revision 73603)
+@@ -275,18 +275,23 @@
+   GtkAllocation widget_allocation;
+ #endif
++
++#ifdef DEBUG_XTBIN
++  printf("gtk_xtbin_realize()\n");
++#endif
++
++  g_return_if_fail (GTK_IS_XTBIN (widget));
++
++  xtbin = GTK_XTBIN (widget);
++
++  /* caculate the allocation before realize */
++#if GTK_CHECK_VERSION(2, 24, 0)
++  allocation.width = gdk_window_get_width(xtbin->parent_window);
++  allocation.height = gdk_window_get_height(xtbin->parent_window);
++#else
+   gint  x, y, w, h, d; /* geometry of window */
+-
+-#ifdef DEBUG_XTBIN
+-  printf("gtk_xtbin_realize()\n");
+-#endif
+-
+-  g_return_if_fail (GTK_IS_XTBIN (widget));
+-
+-  xtbin = GTK_XTBIN (widget);
+-
+-  /* caculate the allocation before realize */
+   gdk_window_get_geometry(xtbin->parent_window, &x, &y, &w, &h, &d);
+   allocation.width = w;
+   allocation.height = h;
++#endif
+   gtk_widget_size_allocate (widget, &allocation);
+ 
+Index: /trunk/WebCore/ChangeLog
+===================================================================
+--- /trunk/WebCore/ChangeLog	(revision 73602)
++++ /trunk/WebCore/ChangeLog	(revision 73603)
+@@ -1,2 +1,10 @@
++2010-12-09  Gustavo Noronha Silva  <gustavo noronha collabora co uk>
++
++        Build fix for GTK+3. Use functions added for GTK+ 2.24 to get the
++        GDK window size.
++
++        * plugins/gtk/gtk2xtbin.c:
++        (gtk_xtbin_realize):
++
+ 2010-12-09  Siddharth Mathur  <siddharth mathur nokia com>
+