r45446 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Jul  1 16:59:54 2015
New Revision: 45446

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45446
Log:
d/p/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch:
Cherry-pick upstream patch to fix testsuite failure causing FTBFS.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=45446&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Wed Jul  1 16:59:54 2015
@@ -15,6 +15,8 @@
   * debian/libglib2.0-0.symbols: Update with g_settings_schema_list_keys.
   * debian/patches/regex-if-PCRE-is-8.34-or-later-disable-auto-possessi.patch:
     Delete, applied upstream.
+  * d/p/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch:
+    Cherry-pick upstream patch to fix testsuite failure causing FTBFS.
 
  -- Iain Lane <laney at debian.org>  Tue, 30 Jun 2015 15:19:06 +0100
 

Added: desktop/experimental/glib2.0/debian/patches/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch?rev=45446&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch	[utf-8] Wed Jul  1 16:59:54 2015
@@ -0,0 +1,77 @@
+From f2c1cfe8c770f73367a021044bcdda550348714c Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Tue, 30 Jun 2015 17:13:49 +0100
+Subject: [PATCH] gio/tests/appmonitor: Delete file before checking for changed
+ event
+
+In 4e7d22e268a4e06beb1c09585a48288c31004da5, deleting the file was moved
+after the assertion which checks for the changed event that results from
+it being deleted. This is the wrong way around and makes the assertion
+fail.
+
+Move the deletion back up before we check the condition. delete_app is
+no longer an idle callback so it can be made void. The change
+notification might come in when the loop isn't running now, so don't try
+to quit if it isn't running. In this case we'll wait for the three
+second timeout and the test will still pass.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=751737
+Applied-Upstream: 2.45.4
+---
+ gio/tests/appmonitor.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gio/tests/appmonitor.c b/gio/tests/appmonitor.c
+index 96b9ac6..9ce6ff0 100644
+--- a/gio/tests/appmonitor.c
++++ b/gio/tests/appmonitor.c
+@@ -24,7 +24,7 @@ create_app (gpointer data)
+   return G_SOURCE_REMOVE;
+ }
+ 
+-static gboolean
++static void
+ delete_app (gpointer data)
+ {
+   const gchar *path = data;
+@@ -35,8 +35,6 @@ delete_app (gpointer data)
+   g_remove (file);
+ 
+   g_free (file);
+-
+-  return G_SOURCE_REMOVE;
+ }
+ 
+ static gboolean changed_fired;
+@@ -53,7 +51,8 @@ quit_loop (gpointer data)
+ {
+   GMainLoop *loop = data;
+ 
+-  g_main_loop_quit (loop);
++  if (g_main_loop_is_running (loop))
++    g_main_loop_quit (loop);
+ 
+   return G_SOURCE_REMOVE;
+ }
+@@ -88,15 +87,16 @@ test_app_monitor (void)
+ 
+   g_timeout_add_seconds (3, quit_loop, loop);
+ 
++  delete_app (path);
++
+   g_main_loop_run (loop);
++
+   g_assert (changed_fired);
+ 
+   g_main_loop_unref (loop);
+ 
+   g_object_unref (monitor);
+ 
+-  delete_app (path);
+-
+   g_free (path);
+ }
+ 
+-- 
+2.1.4
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=45446&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Wed Jul  1 16:59:54 2015
@@ -13,3 +13,4 @@
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
 0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch
+0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch