Merge lp:~ivoks/ubuntu/maverick/glib2.0/887946 into lp:ubuntu/maverick-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/maverick/glib2.0/887946]

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

Revert changes on glib/gmain.c

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

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

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

Fix debian/changelog

[Ante Karamatić (ivoks)]

Addressed issue mentioned in comment.

review: Needs Resubmitting

[Stéphane Graber (stgraber)]

Same comment as for the lucid SRU. The packaging looks good, except for the version number that should be -0ubuntu1.1.

I'll let someone familiar with glib do a final review and upload.

Thanks!

review: Approve

[Sebastien Bacher (seb128)]

setting to rejected, the 10.10 serie is out of support

Unmerged revisions

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

Fix debian/changelog

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

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

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

Revert changes on glib/gmain.c

89. By Ante Karamatić on 2011-11-09

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

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-15 13:57:47 +0000
+++ debian/changelog	2011-11-10 20:02:27 +0000
@@ -1,3 +1,10 @@
+glib2.0 (2.26.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 12:51:54 +0100
+
 glib2.0 (2.26.1-0ubuntu1) maverick-proposed; urgency=low
 
   * New upstream release

=== 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:02: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: maverick/glib/gmain.c
+===================================================================
+--- maverick.orig/glib/gmain.c	2011-11-10 20:30:25.000000000 +0100
++++ maverick/glib/gmain.c	2011-11-10 20:29:50.000000000 +0100
+@@ -1519,7 +1519,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_free (source->name);
+       source->name = NULL;

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-27 22:31:56 +0000
+++ debian/patches/series	2011-11-10 20:02:27 +0000
@@ -5,4 +5,5 @@
 #05_file_size_units.patch
 60_wait-longer-for-threads-to-die.patch
 71_gio_launch_handler.patch
+90-context-unlock.patch