* Drop debian/patches/061_multiarch_module_fallback.patch

gtk+3.0 (3.17.9-3) UNRELEASED; urgency=medium

  * Drop debian/patches/061_multiarch_module_fallback.patch

    - now obsolete since all packages has been fixed to install

      in multiarch directories.

 -- Andreas Henriksson <andreas@fatal.se>  Tue, 22 Sep 2015 16:42:28 +0200

gtk+3.0 (3.17.9-2) experimental; urgency=medium

  * Add debian/patches/git_test-simplify-use-bash.patch from upstream

Description: Fall back to the hard-coded pre-multiarch module directory

 Include /usr/lib/gtk-3.0 in the path as a fallback when building for

 multiarch, to maintain compatibility with packages installing modules to

 the old directories.

Author: Steve Langasek <steve.langasek@linaro.org>

Forwarded: not-needed

--- a/gtk/gtkmodules.c

+++ b/gtk/gtkmodules.c

@@ -55,6 +55,7 @@

   const gchar *exe_prefix;

   gchar *module_path;

   gchar *default_dir;

+  gchar *pre_multiarch_dir = NULL;

   static gchar **result = NULL;

   if (result)

@@ -65,15 +66,17 @@

   if (exe_prefix)

     default_dir = g_build_filename (exe_prefix, "lib", "gtk-3.0", NULL);

-  else

+  else {

     default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL);

+    pre_multiarch_dir = "/usr/lib/gtk-3.0";

+  }

   if (module_path_env)

     module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,

-				module_path_env, default_dir, NULL);

+				module_path_env, default_dir, pre_multiarch_dir, NULL);

   else

     module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,

-				default_dir, NULL);

+				default_dir, pre_multiarch_dir, NULL);

   g_free (default_dir);