r39961 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch patches/series
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Thu Oct 17 14:42:54 UTC 2013
Author: laney
Date: Thu Oct 17 14:42:54 2013
New Revision: 39961
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39961
Log:
* New upstream bugfix release 2.38.1
+ Fix error code checks when SOCK_CLOEXEC is defined but not supported
(fix support for GNU/Hurd)
+ g_settings_list_children: only list viable schemas (fix gsettings
list-recursively crashes with invalid schemas installed)
+ GDBusObjectManagerClient: Fix typo in the /org/freedesktop/DBus path
when adding match rules
- Remove 0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch
* 0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch:
Cherry-pick gio patch to fall back to g_file_query_info if
query_info_on_read is not supported. Fixes copying from backends that
don't implement the latter. (Closes: #715436, LP: #1217230)
Added:
desktop/experimental/glib2.0/debian/patches/0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch
Removed:
desktop/experimental/glib2.0/debian/patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.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=39961&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Oct 17 14:42:54 2013
@@ -1,6 +1,18 @@
-glib2.0 (2.38.0-2) UNRELEASED; urgency=low
+glib2.0 (2.38.1-1) UNRELEASED; urgency=low
* Build-Depend on python:any
+ * New upstream bugfix release 2.38.1
+ + Fix error code checks when SOCK_CLOEXEC is defined but not supported
+ (fix support for GNU/Hurd)
+ + g_settings_list_children: only list viable schemas (fix gsettings
+ list-recursively crashes with invalid schemas installed)
+ + GDBusObjectManagerClient: Fix typo in the /org/freedesktop/DBus path
+ when adding match rules
+ - Remove 0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch
+ * 0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch:
+ Cherry-pick gio patch to fall back to g_file_query_info if
+ query_info_on_read is not supported. Fixes copying from backends that
+ don't implement the latter. (Closes: #715436, LP: #1217230)
-- Iain Lane <laney at debian.org> Wed, 25 Sep 2013 11:26:51 +0000
Added: desktop/experimental/glib2.0/debian/patches/0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch?rev=39961&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch [utf-8] Thu Oct 17 14:42:54 2013
@@ -0,0 +1,59 @@
+From 44edc3829d6db3fabe22d837eaaf2638003516c9 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Wed, 16 Oct 2013 10:10:22 -0400
+Subject: [PATCH] g_file_copy: Fall back to pathname queryinfo to help gvfs
+ backends
+
+It's not difficult to do; not all backends implement it, and for some
+it may be difficult to implement query_info_on_read(), so let's just
+do both.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706254
+---
+ gio/gfile.c | 23 ++++++++++++++++++++++-
+ 1 file changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/gio/gfile.c b/gio/gfile.c
+index afaee21..bf936ec 100644
+--- a/gio/gfile.c
++++ b/gio/gfile.c
+@@ -3112,6 +3112,8 @@ file_copy_fallback (GFile *source,
+
+ if (attrs_to_read != NULL)
+ {
++ GError *tmp_error = NULL;
++
+ /* Ok, ditch the previous lightweight info (on Unix we just
+ * called lstat()); at this point we gather all the information
+ * we need about the source from the opened file descriptor.
+@@ -3119,7 +3121,26 @@ file_copy_fallback (GFile *source,
+ g_object_unref (info);
+
+ info = g_file_input_stream_query_info (file_in, attrs_to_read,
+- cancellable, error);
++ cancellable, &tmp_error);
++ if (!info)
++ {
++ /* Not all gvfs backends implement query_info_on_read(), we
++ * can just fall back to the pathname again.
++ * https://bugzilla.gnome.org/706254
++ */
++ if (g_error_matches (tmp_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
++ {
++ g_clear_error (&tmp_error);
++ info = g_file_query_info (source, attrs_to_read, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
++ cancellable, error);
++ }
++ else
++ {
++ g_free (attrs_to_read);
++ g_propagate_error (error, tmp_error);
++ goto out;
++ }
++ }
+ g_free (attrs_to_read);
+ if (!info)
+ goto out;
+--
+1.8.3.2
+
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=39961&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Thu Oct 17 14:42:54 2013
@@ -1,3 +1,4 @@
+0001-g_file_copy-Fall-back-to-pathname-queryinfo-to-help-.patch
01_gettext-desktopfiles.patch
02_gettext-desktopfiles-ubuntu.patch
03_disble_glib_compile_schemas_warning.patch
@@ -11,4 +12,3 @@
61_glib-compile-binaries-path.patch
90_gio-modules-multiarch-compat.patch
skip-brokwn-dbus-appinfo-test.patch
-0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch
More information about the pkg-gnome-commits
mailing list