Merge lp:~ivoks/ubuntu/lucid/glib2.0/887946 into lp:ubuntu/lucid-proposed/glib2.0

[Ante Karamatić]

gmain: move finalization of GSource outside of context lock
(LP: #887946)

[Dave Walker (davewalker)]

Hey Ante,

Thanks for the merge proposal. I did have a comment:
 - It seems to edit files directly, when the package already makes use of a patching system. Would you be able to convert this to a standalone patch (using DEP-3 headers, http://dep.debian.net/deps/dep3/)?

Thanks.

review: Needs Fixing

[lp:~ivoks/ubuntu/lucid/glib2.0/887946]

59. By Ante Karamatić on 2011-11-10

Revert direct changes to files

60. By Ante Karamatić on 2011-11-10

Add patch debian/patches/patch90-context-unlock.patch from upstream commit 1f853c75ccb0a42757c3661ed36427e69e416af3
(LP: #887946)
Explain patch in debian/changelog

[Ante Karamatić (ivoks)]

Addressed issue mentioned in comment.

review: Resubmit

[Stéphane Graber (stgraber)]

Thanks for the changes, the packaging now looks good except that whoever uploads it will need to change the version number to -0ubuntu1.1 instead of -0ubuntu2 and target lucid-proposed.

I'm just commenting rather than uploading because I don't have enough knowledge about glib to properly review the change and as it's a pretty critical package, I'd rather have someone familiar with it do the final review and upload.

review: Approve

[Chris Halse Rogers (raof)]

This looks ok to me; I've uploaded it.

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-05 12:42:47 +0000
+++ debian/changelog	2011-11-10 20:03:27 +0000
@@ -1,3 +1,10 @@
+glib2.0 (2.24.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/90-context-unlock.patch (LP: #887946):
+    - gmain: move finalization of GSource outside of context lock
+
+ -- Ante Karamatic <[e-mail]>  Wed, 09 Nov 2011 10:33:37 +0100
+
 glib2.0 (2.24.1-0ubuntu1) lucid-proposed; urgency=low
 
   * New upstream version (lp: #575777):

=== added file 'debian/patches/90-context-unlock.patch'
--- debian/patches/90-context-unlock.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/90-context-unlock.patch	2011-11-10 20:03:27 +0000
@@ -0,0 +1,33 @@
+commit 1f853c75ccb0a42757c3661ed36427e69e416af3
+Author: Dan Winship <danw gnome org>
+Date:   Sat Nov 6 09:35:25 2010 -0400
+
+    gmain: move finalization of GSource outside of context lock
+    
+    This avoids ugly deadlock situations such as in
+    https://bugzilla.gnome.org/show_bug.cgi?id=586432
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=626702
+
+ glib/gmain.c |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+---
+Index: 887946/glib/gmain.c
+===================================================================
+--- 887946.orig/glib/gmain.c	2011-11-10 20:53:31.000000000 +0100
++++ 887946/glib/gmain.c	2011-11-10 20:53:14.000000000 +0100
+@@ -1332,7 +1332,13 @@
+ 	g_source_list_remove (source, context);
+ 
+       if (source->source_funcs->finalize)
+-	source->source_funcs->finalize (source);
++	{
++	  if (context)
++	    UNLOCK_CONTEXT (context);
++	  source->source_funcs->finalize (source);
++	  if (context)
++	    LOCK_CONTEXT (context);
++	}
+       
+       g_slist_free (source->poll_fds);
+       source->poll_fds = NULL;

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-15 12:25:27 +0000
+++ debian/patches/series	2011-11-10 20:03:27 +0000
@@ -5,3 +5,4 @@
 60_wait-longer-for-threads-to-die.patch
 71_gio_launch_handler.patch
 80-gtester-subunit.patch
+90-context-unlock.patch