1
Description: Fall back to the hard-coded pre-multiarch module directory
2
Include /usr/lib/gtk-2.0 in the path as a fallback when building for
3
multiarch, to maintain compatibility with packages installing modules to
5
Author: Steve Langasek <steve.langasek@linaro.org>
8
Index: gtk+2.0-2.24.3/gtk/gtkmodules.c
9
===================================================================
10
--- gtk+2.0-2.24.3.orig/gtk/gtkmodules.c
11
+++ gtk+2.0-2.24.3/gtk/gtkmodules.c
1
From: Steve Langasek <steve.langasek@linaro.org>
2
Date: Fri, 22 Jul 2011 18:43:29 +0000
3
Subject: Fall back to the hard-coded pre-multiarch module directory
5
Include /usr/lib/gtk-2.0 in the path as a fallback when building for
6
multiarch, to maintain compatibility with packages installing modules to
9
As of April 2018 this is still required by:
10
- gtk2-engines-cleanice
11
- gtk2-engines-magicchicken
14
- gtk2-engines-wonderland
15
- sugar-artwork-0.88 (no longer in unstable)
18
The equivalent patch in GTK+ 3 was removed in 3.18.0-1.
20
Forwarded: not-needed, Debian-specific
22
gtk/gtkmodules.c | 13 ++++++++-----
23
1 file changed, 8 insertions(+), 5 deletions(-)
25
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
26
index 50729b6..7877557 100644
27
--- a/gtk/gtkmodules.c
28
+++ b/gtk/gtkmodules.c
29
@@ -60,6 +60,7 @@ get_module_path (void)
13
30
gchar *home_gtk_dir = NULL;
14
31
gchar *module_path;
15
32
gchar *default_dir;
17
34
static gchar **result = NULL;
37
@@ -74,21 +75,23 @@ get_module_path (void)
23
40
default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", NULL);