summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch')
-rw-r--r--meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch
new file mode 100644
index 0000000000..ad414ddf36
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch
@@ -0,0 +1,75 @@
1Upstream-Status: Pending
2
3Updated to apply to pango-1.32.5
4
5Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
6diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac
7--- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200
8+++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200
9@@ -213,6 +213,11 @@
10
11 AC_SUBST(PANGO_DEBUG_FLAGS)
12
13+AC_ARG_WITH(mlprefix,
14+ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]),
15+ mlprefix_str=$withval, mlprefix_str="")
16+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.])
17+
18 AC_ARG_ENABLE(rebuilds,
19 [AC_HELP_STRING([--disable-rebuilds],
20 [disable all source autogeneration rules])],,
21diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c
22--- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200
23+++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200
24@@ -555,11 +555,11 @@
25 files = g_new (char *, 3);
26
27 files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
28- "pango.modules",
29+ MLPREFIX "pango.modules",
30 NULL);
31 files[1] = g_build_filename (pango_get_lib_subdirectory (),
32 MODULE_VERSION,
33- "modules.cache",
34+ MLPREFIX "modules.cache",
35 NULL);
36 files[2] = NULL;
37 }
38@@ -674,7 +674,8 @@
39 if (!no_module_warning)
40 {
41 gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
42- "pango.modules",
43+/* For multilib case, keep multiple config file for different libs */
44+ MLPREFIX "pango.modules",
45 NULL);
46 g_critical ("No modules found:\n"
47 "No builtin or dynamically loaded modules were found.\n"
48diff -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej
49--- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200
50+++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200
51@@ -0,0 +1,12 @@
52+--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800
53++++ pango/modules.c 2012-05-08 21:21:02.000000000 +0800
54+@@ -529,7 +529,8 @@
55+
56+ if (!file_str)
57+ file_str = g_build_filename (pango_get_sysconf_subdirectory (),
58+- "pango.modules",
59++/* For multilib case, keep multiple config file for different libs */
60++ MLPREFIX "pango.modules",
61+ NULL);
62+
63+ files = pango_split_file_list (file_str);
64diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c
65--- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300
66+++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200
67@@ -304,7 +304,7 @@
68
69 cache_file = g_build_filename (pango_get_lib_subdirectory (),
70 MODULE_VERSION,
71- "modules.cache",
72+ MLPREFIX "modules.cache",
73 NULL);
74 err = NULL;
75 if (!g_file_set_contents (cache_file, contents->str, -1, &err))