r46854 - in /desktop/experimental/glib2.0/debian: changelog patches/90_gio-modules-multiarch-compat.patch

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Nov  4 17:09:58 2015
New Revision: 46854

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46854
Log:
debian/patches/90_gio-modules-multiarch-compat.patch: Refresh to apply on
this version.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=46854&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Wed Nov  4 17:09:58 2015
@@ -6,6 +6,8 @@
       launching apps. This is now done in the GAppLaunchContext
       implementations when appropriate.
   * debian/watch: Look for development versions too.
+  * debian/patches/90_gio-modules-multiarch-compat.patch: Refresh to apply on
+    this version.
 
  -- Iain Lane <laney at debian.org>  Wed, 04 Nov 2015 15:52:44 +0000
 

Modified: desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch?rev=46854&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch	[utf-8] Wed Nov  4 17:09:58 2015
@@ -6,14 +6,17 @@
 Bug-Debian: https://bugs.debian.org/634099
 Forwarded: no, specific to Debian and its derivatives
 
+Index: b/gio/giomodule.c
+===================================================================
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -1049,6 +1049,8 @@
-         module_dir = GIO_MODULE_DIR;
- 
-       g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
-+      /* Hard-coded fallback directory for pre-multiarch compatibility */
-+      g_io_modules_scan_all_in_directory ("/usr/lib/gio/modules");
+@@ -1086,6 +1086,9 @@
  
        g_io_module_scope_free (scope);
  
++      /* Hard-coded fallback directory for pre-multiarch compatibility */
++      g_io_modules_scan_all_in_directory ("/usr/lib/gio/modules");
++
+       /* Initialize types from built-in "modules" */
+       g_type_ensure (g_null_settings_backend_get_type ());
+       g_type_ensure (g_memory_settings_backend_get_type ());