[jhbuild] Add a patch to make spice-gtk build with current gtk



commit e5bd313afb43fc77291bf21516a7fb7946faaefa
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 5 11:40:36 2012 -0400

    Add a patch to make spice-gtk build with current gtk

 modulesets/gnome-apps-3.6.modules |    5 ++++-
 patches/spice-gtk-threads.patch   |   15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index ddfec58..b021c9c 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -474,7 +474,10 @@
             module="gtk/spice-gtk-0.12.101.tar.bz2"
             version="0.12.101"
             hash="sha256:73c74843674425d4a1e35777fc3cfe629f47a71596bdf1e3f2c28a9677d3da00"
-            size="1163312"/>
+            size="1163312">
+      <!-- https://bugs.freedesktop.org/show_bug.cgi?id=53142 -->
+      <patch file="spice-gtk-threads.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="celt"/>
       <dep package="spice-protocol"/>
diff --git a/patches/spice-gtk-threads.patch b/patches/spice-gtk-threads.patch
new file mode 100644
index 0000000..5d657ab
--- /dev/null
+++ b/patches/spice-gtk-threads.patch
@@ -0,0 +1,15 @@
+diff -up spice-gtk-0.12.101/gtk/spice-gtk-session.c.threads spice-gtk-0.12.101/gtk/spice-gtk-session.c
+--- spice-gtk-0.12.101/gtk/spice-gtk-session.c.threads	2012-08-05 11:36:56.439347607 -0400
++++ spice-gtk-0.12.101/gtk/spice-gtk-session.c	2012-08-05 11:37:18.247353136 -0400
+@@ -619,9 +619,9 @@ static void clipboard_get(GtkClipboard *
+ 
+     /* apparently, this is needed to avoid dead-lock, from
+        gtk_dialog_run */
+-    GDK_THREADS_LEAVE();
++    gdk_threads_leave();
+     g_main_loop_run(ri.loop);
+-    GDK_THREADS_ENTER();
++    gdk_threads_enter();
+ 
+     g_main_loop_unref(ri.loop);
+     ri.loop = NULL;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]