summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch42
-rw-r--r--meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch75
-rw-r--r--meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch (renamed from meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch)0
-rw-r--r--meta/recipes-graphics/pango/pango.inc6
-rw-r--r--meta/recipes-graphics/pango/pango_1.32.5.bb (renamed from meta/recipes-graphics/pango/pango_1.30.1.bb)4
5 files changed, 80 insertions, 47 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
deleted file mode 100644
index 3f00ad8de5..0000000000
--- a/meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch
+++ /dev/null
@@ -1,42 +0,0 @@
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.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))
diff --git a/meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch b/meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch
index ddfc126226..ddfc126226 100644
--- a/meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch
+++ b/meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 81c2a7ee65..ce5caf6120 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,13 +10,13 @@ SECTION = "libs"
10LICENSE = "LGPLv2.0+" 10LICENSE = "LGPLv2.0+"
11 11
12X11DEPENDS = "virtual/libx11 libxft" 12X11DEPENDS = "virtual/libx11 libxft"
13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils pango-native" 13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils pango-native harfbuzz"
14 14
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
16PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" 16PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
17 17
18BBCLASSEXTEND = "native" 18BBCLASSEXTEND = "native"
19DEPENDS_class-native = "glib-2.0-native cairo-native" 19DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
20 20
21PACKAGES_DYNAMIC += "^pango-module-.*" 21PACKAGES_DYNAMIC += "^pango-module-.*"
22 22
@@ -41,7 +41,7 @@ EXTRA_OECONF = "--disable-glibtest \
41 --with-mlprefix=${MLPREFIX}" 41 --with-mlprefix=${MLPREFIX}"
42 42
43LEAD_SONAME = "libpango-1.0*" 43LEAD_SONAME = "libpango-1.0*"
44LIBV = "1.6.0" 44LIBV = "1.8.0"
45 45
46postinst_prologue() { 46postinst_prologue() {
47if ! [ -e $D${sysconfdir}/pango ] ; then 47if ! [ -e $D${sysconfdir}/pango ] ; then
diff --git a/meta/recipes-graphics/pango/pango_1.30.1.bb b/meta/recipes-graphics/pango/pango_1.32.5.bb
index 7254321744..e71f514028 100644
--- a/meta/recipes-graphics/pango/pango_1.30.1.bb
+++ b/meta/recipes-graphics/pango/pango_1.32.5.bb
@@ -9,7 +9,7 @@ GNOME_COMPRESS_TYPE="xz"
9SRC_URI += "file://no-tests.patch \ 9SRC_URI += "file://no-tests.patch \
10 file://multilib-fix-clean.patch" 10 file://multilib-fix-clean.patch"
11 11
12SRC_URI[archive.md5sum] = "ec3c1f236ee9bd4a982a5f46fcaff7b9" 12SRC_URI[archive.md5sum] = "8e846804d6e219bc795a26a4a39b5bfd"
13SRC_URI[archive.sha256sum] = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe" 13SRC_URI[archive.sha256sum] = "7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821"
14 14
15#PARALLEL_MAKE = "" 15#PARALLEL_MAKE = ""