r35620 - in /desktop/experimental/glib2.0/debian: changelog patches/revert_g_file_make_directory_with_parents_error_propagation.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Mon Aug 20 04:08:44 2012
New Revision: 35620

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35620
Log:
Add revert_g_file_make_directory_with_parents_error_propagation.patch:
This reverts upstream commit b0bce4ad41937dabf7e5c94dcce3caf4e88f3f97
which caused applications to segfault. The proper fix will be in the next
glib release, so this patch should be dropped then. (LP: #1035688)

Added:
    desktop/experimental/glib2.0/debian/patches/revert_g_file_make_directory_with_parents_error_propagation.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=35620&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Mon Aug 20 04:08:44 2012
@@ -1,3 +1,12 @@
+glib2.0 (2.33.8-2) UNRELEASED; urgency=low
+
+  * Add revert_g_file_make_directory_with_parents_error_propagation.patch:
+    This reverts upstream commit b0bce4ad41937dabf7e5c94dcce3caf4e88f3f97
+    which caused applications to segfault. The proper fix will be in the next
+    glib release, so this patch should be dropped then. (LP: #1035688)
+
+ -- Iain Lane <laney at debian.org>  Thu, 16 Aug 2012 11:48:21 +0100
+
 glib2.0 (2.33.8-1) experimental; urgency=low
 
   * New upstream release 2.33.8.

Added: desktop/experimental/glib2.0/debian/patches/revert_g_file_make_directory_with_parents_error_propagation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/revert_g_file_make_directory_with_parents_error_propagation.patch?rev=35620&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/revert_g_file_make_directory_with_parents_error_propagation.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/revert_g_file_make_directory_with_parents_error_propagation.patch [utf-8] Mon Aug 20 04:08:44 2012
@@ -1,0 +1,28 @@
+Description: Revert upstream commit b0bce4ad41937dabf7e5c94dcce3caf4e88f3f97
+ which introduced segfaults in many applications using
+ g_file_make_directory_with_parents
+Forwarded: not-needed
+Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=680823
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/glib2.0/+bug/1035688
+
+Index: b/gio/gfile.c
+===================================================================
+--- a/gio/gfile.c
++++ b/gio/gfile.c
+@@ -3395,14 +3395,12 @@
+       work_file = g_object_ref (parent_file);
+ 
+       if (!result && my_error->code == G_IO_ERROR_NOT_FOUND)
+-        {
+-          g_clear_error (&my_error);
+-          list = g_list_prepend (list, parent_file);  /* Transfer ownership of ref */
+-        }
++        list = g_list_prepend (list, parent_file);  /* Transfer ownership of ref */
+       else
+         g_object_unref (parent_file);
+     }
+ 
++  g_clear_error (&my_error);
+   for (l = list; result && l; l = l->next)
+     {
+       result = g_file_make_directory ((GFile *) l->data, cancellable, &my_error);

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35620&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Mon Aug 20 04:08:44 2012
@@ -7,3 +7,4 @@
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_pcre_8.31_test.patch
+revert_g_file_make_directory_with_parents_error_propagation.patch