r34157 - in /desktop/unstable/eog/debian: changelog patches/0001-Don-t-lock-GDK-around-g_application_run.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Apr  4 21:23:14 2012
New Revision: 34157

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34157
Log:
debian/patches/0001-Don-t-lock-GDK-around-g_application_run.patch:
Don't lock GDK around g_application_run(). An unintended interaction
between GtkApplication and GDK threading made this necessary before.
That code has since been simplified, breaking this formerly-working code.
Patch cherry-picked from upstream Git. (Closes: #665374)

Added:
    desktop/unstable/eog/debian/patches/0001-Don-t-lock-GDK-around-g_application_run.patch
Modified:
    desktop/unstable/eog/debian/changelog
    desktop/unstable/eog/debian/patches/series

Modified: desktop/unstable/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/changelog?rev=34157&op=diff
==============================================================================
--- desktop/unstable/eog/debian/changelog [utf-8] (original)
+++ desktop/unstable/eog/debian/changelog [utf-8] Wed Apr  4 21:23:14 2012
@@ -1,3 +1,13 @@
+eog (3.2.2-3) UNRELEASED; urgency=low
+
+  * debian/patches/0001-Don-t-lock-GDK-around-g_application_run.patch:
+    Don't lock GDK around g_application_run(). An unintended interaction
+    between GtkApplication and GDK threading made this necessary before.
+    That code has since been simplified, breaking this formerly-working code.
+    Patch cherry-picked from upstream Git. (Closes: #665374)
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 19 Nov 2011 01:38:53 +0100
+
 eog (3.2.2-2) unstable; urgency=low
 
   * Upload to unstable.

Added: desktop/unstable/eog/debian/patches/0001-Don-t-lock-GDK-around-g_application_run.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/patches/0001-Don-t-lock-GDK-around-g_application_run.patch?rev=34157&op=file
==============================================================================
--- desktop/unstable/eog/debian/patches/0001-Don-t-lock-GDK-around-g_application_run.patch (added)
+++ desktop/unstable/eog/debian/patches/0001-Don-t-lock-GDK-around-g_application_run.patch [utf-8] Wed Apr  4 21:23:14 2012
@@ -1,0 +1,39 @@
+From 71c389bc993d66945418cf6ec711f5a9b7812671 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Wed, 2 Nov 2011 10:08:14 -0400
+Subject: [PATCH] Don't lock GDK around g_application_run()
+
+An unintended interaction between GtkApplication and GDK threading made
+this necessary before.  That code has since been simplified, breaking
+this formerly-working code.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662630
+---
+ src/main.c |    4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 771cd46..a0d6863 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -156,8 +156,6 @@ main (int argc, char **argv)
+ 	              "gtk-application-prefer-dark-theme", TRUE,
+ 	              NULL);
+ 
+-	gdk_threads_enter ();
+-
+ 	EOG_APP->flags = flags;
+ 	if (force_new_instance) {
+ 		GApplicationFlags app_flags = g_application_get_flags (G_APPLICATION (EOG_APP));
+@@ -168,8 +166,6 @@ main (int argc, char **argv)
+ 	g_application_run (G_APPLICATION (EOG_APP), argc, argv);
+ 	g_object_unref (EOG_APP);
+ 
+-	gdk_threads_leave ();
+-
+   	if (startup_files)
+ 		g_strfreev (startup_files);
+ 
+-- 
+1.7.9.5
+

Modified: desktop/unstable/eog/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/patches/series?rev=34157&op=diff
==============================================================================
--- desktop/unstable/eog/debian/patches/series [utf-8] (original)
+++ desktop/unstable/eog/debian/patches/series [utf-8] Wed Apr  4 21:23:14 2012
@@ -1,0 +1,1 @@
+0001-Don-t-lock-GDK-around-g_application_run.patch