diff options
author | Radu Moisan <radu.moisan@intel.com> | 2012-08-06 16:07:02 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-15 14:26:39 +0100 |
commit | 1834db1ddd02887238144728fc90c50b4805071c (patch) | |
tree | 61156c4e5bb569957078a2519c3005208850f86e /meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch | |
parent | 5c96735dbc9e77f2b5dd86f532aa467d78e553e2 (diff) | |
download | poky-1834db1ddd02887238144728fc90c50b4805071c.tar.gz |
pango: upgrade to upstream stable 1.30.0
(From OE-Core rev: dec33ee2c8badb64b90ce8230f218c6898f3703c)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch')
-rw-r--r-- | meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch deleted file mode 100644 index 3f00ad8de5..0000000000 --- a/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: 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])],, | ||
19 | Index: 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" | ||