ce61c8b596
* Sync with ubuntu:
* debian/rules: Make test failures fatal again
* debian/libgtk-3-0.symbols: Updated
* debian/rules: Update build-depends
* debian/libgtk-3-bin.install: Add gtk-launch: A new commandline utility
to launch an application from its desktop file
* Add autopkgtest support
* debian/patches/072_statusicon_icon_size.patch:
* Removed merged upstream
* debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch:
* Removed, fixed upstream
* debian/patches/073_transparent_colors.patch
* Removed, fixed upstream
* debian/control.in: bump glib2.0 build-dep to >= 2.33.14 to trump the dodgy
version in unstable
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
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
|
|
|
|
Index: gtk+-3.5.2/gtk/gtkmodules.c
|
|
===================================================================
|
|
--- gtk+-3.5.2.orig/gtk/gtkmodules.c 2012-04-30 22:42:29.000000000 +1200
|
|
+++ gtk+-3.5.2/gtk/gtkmodules.c 2012-05-22 17:21:02.554436536 +1200
|
|
@@ -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);
|
|
|