[jhbuild] 3.6: Patch WebKit so empathy builds

[Craig Keogh <cskeogh src gnome org>]

commit 0b02e61f8287fcce4a322943fd2979c3adcf4eb8
Author: Craig Keogh <cskeogh adam com au>
Date:   Thu Aug 23 16:34:28 2012 +0930

    3.6: Patch WebKit so empathy builds
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=681396

 modulesets/gnome-suites-core-deps-3.6.modules |    7 ++
 patches/WebKit-1.3.9-changeset_r75081.diff    |   28 ---------
 patches/WebKit-1.9.6-changeset_125056.diff    |   76 +++++++++++++++++++++++++
 patches/WebKit-1.9.6-changeset_125183.diff    |   31 ++++++++++
 4 files changed, 114 insertions(+), 28 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index c40fd7a..8a26c17 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -1029,6 +1029,13 @@
             module="webkit-1.9.6.tar.xz" version="1.9.6"
             hash="sha256:6cb8eaf26e29ce5dc7cd5e225bcd0e5ecbd493775932e74862d232b0ffaf93ee"
             size="8373840">
+      <!-- Two patches required for empathy to build
+            https://bugzilla.gnome.org/show_bug.cgi?id=681396
+            Remove when 1.9.7 or greater released. -->
+      <!-- http://trac.webkit.org/changeset/125056 -->
+      <patch file="WebKit-1.9.6-changeset_125056.diff" strip="2" />
+      <!-- http://trac.webkit.org/changeset/125183 -->
+      <patch file="WebKit-1.9.6-changeset_125183.diff" strip="2" />
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
diff --git a/patches/WebKit-1.9.6-changeset_125056.diff b/patches/WebKit-1.9.6-changeset_125056.diff
new file mode 100644
index 0000000..683f819
--- /dev/null
+++ b/patches/WebKit-1.9.6-changeset_125056.diff
@@ -0,0 +1,76 @@
+Index: /trunk/Source/WebCore/ChangeLog
+===================================================================
+--- /trunk/Source/WebCore/ChangeLog	(revision 125055)
++++ /trunk/Source/WebCore/ChangeLog	(revision 125056)
+@@ -1,2 +1,25 @@
++2012-08-08  Xan Lopez  <xlopez igalia com>
++
++        Evolution, empathy no longer build with webkint 1.9.6:  webkit_dom_html_element_set_class_name is gone
++        https://bugs.webkit.org/show_bug.cgi?id=93384
++
++        Reviewed by Adam Barth.
++
++        Provide custom backwards compatibility wrappers for HTMLElement
++        className accessors, since the attribute was moved to Element. The
++        previous fix attempted to define the attribute twice (once in each
++        class), but this is wrong, just provide again the old accessors
++        making them forward to the new methods.
++
++        * bindings/gobject/WebKitDOMCustom.cpp:
++        (webkit_dom_html_element_get_class_name): provide again
++        get_class_name for backwards compatibility.
++        (webkit_dom_html_element_set_class_name): provide again
++        set_class_name for backwards compatibility.
++        * bindings/gobject/WebKitDOMCustom.h: ditto.
++        * html/HTMLElement.idl: remove the className attribute
++        definition. Since it's already present in Element this will break
++        our bindings.
++
+ 2012-08-07  Ojan Vafai  <ojan chromium org>
+ 
+Index: /trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp
+===================================================================
+--- /trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp	(revision 125055)
++++ /trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp	(revision 125056)
+@@ -50,4 +50,16 @@
+ }
+ 
++gchar*
++webkit_dom_html_element_get_class_name(WebKitDOMHTMLElement* element)
++{
++    return webkit_dom_element_get_class_name(WEBKIT_DOM_ELEMENT(element));
++}
++
++void
++webkit_dom_html_element_set_class_name(WebKitDOMHTMLElement* element, const gchar* value)
++{
++    webkit_dom_element_set_class_name(WEBKIT_DOM_ELEMENT(element), value);
++}
++
+ void
+ webkit_dom_html_form_element_dispatch_form_change(WebKitDOMHTMLFormElement* self)
+Index: /trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h
+===================================================================
+--- /trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h	(revision 125055)
++++ /trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h	(revision 125056)
+@@ -31,4 +31,6 @@
+ /* Compatibility */
+ WEBKIT_API WebKitDOMBlob* webkit_dom_blob_webkit_slice(WebKitDOMBlob* self, gint64 start, gint64 end, const gchar* content_type);
++WEBKIT_API gchar* webkit_dom_html_element_get_class_name(WebKitDOMHTMLElement* element);
++WEBKIT_API void webkit_dom_html_element_set_class_name(WebKitDOMHTMLElement* element, const gchar* value);
+ WEBKIT_API void webkit_dom_html_form_element_dispatch_form_change(WebKitDOMHTMLFormElement* self);
+ WEBKIT_API void webkit_dom_html_form_element_dispatch_form_input(WebKitDOMHTMLFormElement* self);
+#Index: /trunk/Source/WebCore/html/HTMLElement.idl
+#===================================================================
+#--- /trunk/Source/WebCore/html/HTMLElement.idl	(revision 125055)
+#+++ /trunk/Source/WebCore/html/HTMLElement.idl	(revision 125056)
+#@@ -93,9 +93,4 @@
+# #endif
+# 
+#-#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT // Keep on HTMLElement for #backwards compat.
+#-        attribute [Reflect=class] DOMString className;
+#-#endif
+#-
+#-
+#         void click();
+#     };
diff --git a/patches/WebKit-1.9.6-changeset_125183.diff b/patches/WebKit-1.9.6-changeset_125183.diff
new file mode 100644
index 0000000..864628e
--- /dev/null
+++ b/patches/WebKit-1.9.6-changeset_125183.diff
@@ -0,0 +1,31 @@
+Index: /trunk/Source/WebCore/dom/Document.idl
+===================================================================
+--- /trunk/Source/WebCore/dom/Document.idl	(revision 125182)
++++ /trunk/Source/WebCore/dom/Document.idl	(revision 125183)
+@@ -76,5 +76,5 @@
+             raises (DOMException);
+ 
+-#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
++#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
+         // document.documentURI was writable in DOM3 Core, but is read-only in DOM4
+         // (see http://www.w3.org/TR/2011/WD-dom-20110915/#document). We need to keep
+Index: /trunk/Source/WebCore/ChangeLog
+===================================================================
+--- /trunk/Source/WebCore/ChangeLog	(revision 125182)
++++ /trunk/Source/WebCore/ChangeLog	(revision 125183)
+@@ -1,2 +1,15 @@
++2012-08-09  Xan Lopez  <xlopez igalia com>
++
++        1.9.6 drops symbols, breaking compatibility
++        https://bugs.webkit.org/show_bug.cgi?id=93477
++
++        Reviewed by Carlos Garcia Campos.
++
++        Expose documentURI as writable again for the GObject DOM
++        bindings. DOM4 makes it read-only, but we need to revert to the
++        old state for compatibility reasons, just like Objective C.
++
++        * dom/Document.idl: ditto.
++
+ 2012-08-09  Mario Sanchez Prada  <msanchez igalia com>
+