[GTK] socket_embed_hook hitting NULL-check assertion running TestWebKit2
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Sep 2013 15:47:24 +0000 (15:47 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Sep 2013 15:47:24 +0000 (15:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=121294

Patch by Mario Sanchez Prada <mario.prada@samsung.com> on 2013-09-20
Reviewed by Martin Robinson.

Provide a new patch to deal with the issue in the GTK+ module from
the internal jhbuild environment. This issue has been reported
upstream (see https://bugzilla.gnome.org/show_bug.cgi?id=708024).

* gtk/jhbuild.modules: Apply the new patch to the GTK+ module.
* gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156167 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/gtk/jhbuild.modules
Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch [new file with mode: 0644]

index 55f849c84b89c5b82140dc90f17d6dbe01d22583..d21ffdc970a6344189262abe8f17aad0916c5cd6 100644 (file)
@@ -1,3 +1,17 @@
+2013-09-20  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [GTK] socket_embed_hook hitting NULL-check assertion running TestWebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=121294
+
+        Reviewed by Martin Robinson.
+
+        Provide a new patch to deal with the issue in the GTK+ module from
+        the internal jhbuild environment. This issue has been reported
+        upstream (see https://bugzilla.gnome.org/show_bug.cgi?id=708024).
+
+        * gtk/jhbuild.modules: Apply the new patch to the GTK+ module.
+        * gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch: Added.
+
 2013-09-20  Denis Nomiyama  <d.nomiyama@samsung.com>
 
         [ATK][WTR] accessibility/aria-invalid.html times out
index 88d0146d69b7a16a780e2e30e86fe97705e869c8..1af5e290947581065c32cdb4c2f3c69dc7e53c3e 100644 (file)
     </dependencies>
     <branch module="/pub/GNOME/sources/gtk+/3.6/gtk+-3.6.0.tar.xz" version="3.6.0"
             repo="ftp.gnome.org"
-            hash="sha256:e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049"/>
+            hash="sha256:e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049">
+      <patch file="gtk-3.6-do-not-shutdown-accessibility.patch" strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="glib"
diff --git a/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch b/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch
new file mode 100644 (file)
index 0000000..94636c7
--- /dev/null
@@ -0,0 +1,39 @@
+--- gtk+-3.6.0/gtk/gtkmain.c   2012-09-18 16:34:42.000000000 +0100
++++ gtk+-3.6.0/gtk/gtkmain.c   2013-09-16 17:36:58.046546545 +0100
+@@ -671,7 +671,6 @@
+ /* XXX: Remove me after getting rid of gail */
+ extern void _gtk_accessibility_init (void);
+-extern void _gtk_accessibility_shutdown (void);
+ static void
+ do_post_parse_initialization (int    *argc,
+@@ -1180,8 +1179,6 @@
+       /* Synchronize the recent manager singleton */
+       _gtk_recent_manager_sync ();
+-
+-      _gtk_accessibility_shutdown ();
+     }
+ }
+--- gtk+-3.6.0/gtk/gtkapplication.c    2012-09-24 00:57:30.000000000 +0100
++++ gtk+-3.6.0/gtk/gtkapplication.c    2013-09-16 17:37:23.154671051 +0100
+@@ -47,8 +47,6 @@
+ #include <gdk/x11/gdkx.h>
+ #endif
+-extern void _gtk_accessibility_shutdown (void);
+-
+ /**
+  * SECTION:gtkapplication
+  * @title: GtkApplication
+@@ -433,8 +431,6 @@
+   /* Synchronize the recent manager singleton */
+   _gtk_recent_manager_sync ();
+-  _gtk_accessibility_shutdown ();
+-
+   G_APPLICATION_CLASS (gtk_application_parent_class)
+     ->shutdown (application);
+ }