summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/pango/pango-1.30.1
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/pango/pango-1.30.1')
-rw-r--r--meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch42
-rw-r--r--meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch15
2 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch
new file mode 100644
index 0000000000..3f00ad8de5
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch
@@ -0,0 +1,42 @@
1Upstream-Status: Pending
2
3Index: pango-1.28.4/configure.in
4===================================================================
5--- pango-1.28.4.orig/configure.in 2011-04-05 04:29:16.000000000 +0800
6+++ pango-1.28.4/configure.in 2012-05-08 21:32:17.000000000 +0800
7@@ -205,6 +205,11 @@
8
9 AC_SUBST(PANGO_DEBUG_FLAGS)
10
11+AC_ARG_WITH(mlprefix,
12+ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]),
13+ mlprefix_str=$withval, mlprefix_str="")
14+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.])
15+
16 AC_ARG_ENABLE(rebuilds,
17 [AC_HELP_STRING([--disable-rebuilds],
18 [disable all source autogeneration rules])],,
19Index: pango-1.28.4/pango/modules.c
20===================================================================
21--- pango-1.28.4.orig/pango/modules.c 2010-09-22 03:37:01.000000000 +0800
22+++ pango-1.28.4/pango/modules.c 2012-05-08 21:21:02.000000000 +0800
23@@ -529,7 +529,8 @@
24
25 if (!file_str)
26 file_str = g_build_filename (pango_get_sysconf_subdirectory (),
27- "pango.modules",
28+/* For multilib case, keep multiple config file for different libs */
29+ MLPREFIX "pango.modules",
30 NULL);
31
32 files = pango_split_file_list (file_str);
33@@ -640,7 +641,8 @@
34 if (!no_module_warning)
35 {
36 gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
37- "pango.modules",
38+/* For multilib case, keep multiple config file for different libs */
39+ MLPREFIX "pango.modules",
40 NULL);
41 g_critical ("No modules found:\n"
42 "No builtin or dynamically loaded modules were found.\n"
diff --git a/meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch b/meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch
new file mode 100644
index 0000000000..ddfc126226
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch
@@ -0,0 +1,15 @@
1Signed-off-by: Radu Moisan <radu.moisan@intel.com>
2Upstream-Status: Pending
3
4Index: pango-1.30.0/Makefile.am
5===================================================================
6--- pango-1.30.0.orig/Makefile.am 2011-08-16 04:11:08.000000000 +0300
7+++ pango-1.30.0/Makefile.am 2012-08-06 12:48:27.000000000 +0300
8@@ -1,6 +1,6 @@
9 ## Process this file with automake to create Makefile.in.
10
11-SUBDIRS= pango modules pango-view examples docs tools tests build
12+SUBDIRS= pango modules pango-view examples docs tools build
13
14 EXTRA_DIST = \
15 autogen.sh \