r30604 - in /desktop/experimental/glib2.0/debian: changelog patches/70-fix-race-in-gdbus-connection-test.patch patches/series rules

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Oct 16 10:51:07 2011
New Revision: 30604

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30604
Log:
* debian/rules: Explicitely build gtk-doc
* debian/patches/70-fix-race-in-gdbus-connection-test.patch:
  - Added, fix race condition in the GDBusConnection life-cycle test

Added:
    desktop/experimental/glib2.0/debian/patches/70-fix-race-in-gdbus-connection-test.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=30604&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Sun Oct 16 10:51:07 2011
@@ -38,7 +38,12 @@
   * Break gtk3 < 3.0.12 because it uses an internal symbol that ceases 
     to work with glib 2.30.
 
- -- Michael Biebl <biebl at debian.org>  Sat, 15 Oct 2011 19:30:25 +0200
+  [ Sjoerd Simons ]
+  * debian/rules: Explicitely build gtk-doc
+  * debian/patches/70-fix-race-in-gdbus-connection-test.patch:
+    - Added, fix race condition in the GDBusConnection life-cycle test
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 16 Oct 2011 11:50:31 +0100
 
 glib2.0 (2.28.6-3) experimental; urgency=low
 

Added: desktop/experimental/glib2.0/debian/patches/70-fix-race-in-gdbus-connection-test.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/70-fix-race-in-gdbus-connection-test.patch?rev=30604&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/70-fix-race-in-gdbus-connection-test.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/70-fix-race-in-gdbus-connection-test.patch [utf-8] Sun Oct 16 10:51:07 2011
@@ -1,0 +1,36 @@
+From 7e4c0ce7b7f7894b7f97e8484dc2101885e72702 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sun, 16 Oct 2011 10:57:29 +0100
+Subject: [PATCH] GDBusConnection: Fix race in /gdbus/connection/life-cycle
+
+GDBusConnection sets the closed flag in the worker thread, then adds an
+idle callback (which refs the Connection) to signal this in the main
+thread. The tests session_bus_down doesn't spin the mainloop, so the
+"closed" signal will always fire if iterating the mainloop later (and
+drops the ref when doing so). But _is_closed can return TRUE even before
+signalling this, in which case the "closed" signal isn't fired and the
+ref isn't dropped, causing the test to fail.
+
+Instead simply always wait for the closed signal, which is a good thing
+to check anyway and ensures the ref is closed.
+---
+ gio/tests/gdbus-connection.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
+index a88df90..073ff9e 100644
+--- a/gio/tests/gdbus-connection.c
++++ b/gio/tests/gdbus-connection.c
+@@ -264,8 +264,7 @@ test_connection_life_cycle (void)
+   g_assert (!g_dbus_connection_is_closed (c));
+   g_dbus_connection_set_exit_on_close (c, FALSE);
+   session_bus_down ();
+-  if (!g_dbus_connection_is_closed (c))
+-    _g_assert_signal_received (c, "closed");
++  _g_assert_signal_received (c, "closed");
+   g_assert (g_dbus_connection_is_closed (c));
+ 
+   _g_object_wait_for_single_ref (c);
+-- 
+1.7.7
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=30604&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Sun Oct 16 10:51:07 2011
@@ -3,3 +3,4 @@
 02_gettext-desktopfiles-ubuntu.patch
 04_homedir_env.patch
 61_glib-compile-schemas-path.patch
+70-fix-race-in-gdbus-connection-test.patch

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=30604&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Sun Oct 16 10:51:07 2011
@@ -54,6 +54,7 @@
 			--with-pcre=system
 
 DEB_CONFIGURE_FLAGS_deb := \
+			--enable-gtk-doc \
 			--enable-static
 
 DEB_CONFIGURE_FLAGS_udeb := \