summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/pango
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-09 14:13:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:42:37 +0000
commitbcc5773199b46811f913d06e960d34ed9833f714 (patch)
tree0d4f1a619cd5fec2a29a75064e2c286a10875990 /meta/recipes-graphics/pango
parent6f5ab158203101db69d11754a77b0fd6fbb23f87 (diff)
downloadopenembedded-core-contrib-bcc5773199b46811f913d06e960d34ed9833f714.tar.gz
openembedded-core-contrib-bcc5773199b46811f913d06e960d34ed9833f714.tar.bz2
openembedded-core-contrib-bcc5773199b46811f913d06e960d34ed9833f714.zip
pango: update to upstream version 1.32.5
multilib-fix-clean.patch adjusted to apply cleanly, and to handle new modules.cache file. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/pango')
-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 @@
-Upstream-Status: Pending
-
-Index: pango-1.28.4/configure.in
-===================================================================
---- pango-1.28.4.orig/configure.in 2011-04-05 04:29:16.000000000 +0800
-+++ pango-1.28.4/configure.in 2012-05-08 21:32:17.000000000 +0800
-@@ -205,6 +205,11 @@
-
- AC_SUBST(PANGO_DEBUG_FLAGS)
-
-+AC_ARG_WITH(mlprefix,
-+ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]),
-+ mlprefix_str=$withval, mlprefix_str="")
-+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.])
-+
- AC_ARG_ENABLE(rebuilds,
- [AC_HELP_STRING([--disable-rebuilds],
- [disable all source autogeneration rules])],,
-Index: pango-1.28.4/pango/modules.c
-===================================================================
---- pango-1.28.4.orig/pango/modules.c 2010-09-22 03:37:01.000000000 +0800
-+++ pango-1.28.4/pango/modules.c 2012-05-08 21:21:02.000000000 +0800
-@@ -529,7 +529,8 @@
-
- if (!file_str)
- file_str = g_build_filename (pango_get_sysconf_subdirectory (),
-- "pango.modules",
-+/* For multilib case, keep multiple config file for different libs */
-+ MLPREFIX "pango.modules",
- NULL);
-
- files = pango_split_file_list (file_str);
-@@ -640,7 +641,8 @@
- if (!no_module_warning)
- {
- gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
-- "pango.modules",
-+/* For multilib case, keep multiple config file for different libs */
-+ MLPREFIX "pango.modules",
- NULL);
- g_critical ("No modules found:\n"
- "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 @@
+Upstream-Status: Pending
+
+Updated to apply to pango-1.32.5
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac
+--- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200
++++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200
+@@ -213,6 +213,11 @@
+
+ AC_SUBST(PANGO_DEBUG_FLAGS)
+
++AC_ARG_WITH(mlprefix,
++ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]),
++ mlprefix_str=$withval, mlprefix_str="")
++AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.])
++
+ AC_ARG_ENABLE(rebuilds,
+ [AC_HELP_STRING([--disable-rebuilds],
+ [disable all source autogeneration rules])],,
+diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c
+--- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200
++++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200
+@@ -555,11 +555,11 @@
+ files = g_new (char *, 3);
+
+ files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
+- "pango.modules",
++ MLPREFIX "pango.modules",
+ NULL);
+ files[1] = g_build_filename (pango_get_lib_subdirectory (),
+ MODULE_VERSION,
+- "modules.cache",
++ MLPREFIX "modules.cache",
+ NULL);
+ files[2] = NULL;
+ }
+@@ -674,7 +674,8 @@
+ if (!no_module_warning)
+ {
+ gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
+- "pango.modules",
++/* For multilib case, keep multiple config file for different libs */
++ MLPREFIX "pango.modules",
+ NULL);
+ g_critical ("No modules found:\n"
+ "No builtin or dynamically loaded modules were found.\n"
+diff -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej
+--- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200
++++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200
+@@ -0,0 +1,12 @@
++--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800
+++++ pango/modules.c 2012-05-08 21:21:02.000000000 +0800
++@@ -529,7 +529,8 @@
++
++ if (!file_str)
++ file_str = g_build_filename (pango_get_sysconf_subdirectory (),
++- "pango.modules",
+++/* For multilib case, keep multiple config file for different libs */
+++ MLPREFIX "pango.modules",
++ NULL);
++
++ files = pango_split_file_list (file_str);
+diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c
+--- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300
++++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200
+@@ -304,7 +304,7 @@
+
+ cache_file = g_build_filename (pango_get_lib_subdirectory (),
+ MODULE_VERSION,
+- "modules.cache",
++ MLPREFIX "modules.cache",
+ NULL);
+ err = NULL;
+ 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"
LICENSE = "LGPLv2.0+"
X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils pango-native"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils pango-native harfbuzz"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
BBCLASSEXTEND = "native"
-DEPENDS_class-native = "glib-2.0-native cairo-native"
+DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
PACKAGES_DYNAMIC += "^pango-module-.*"
@@ -41,7 +41,7 @@ EXTRA_OECONF = "--disable-glibtest \
--with-mlprefix=${MLPREFIX}"
LEAD_SONAME = "libpango-1.0*"
-LIBV = "1.6.0"
+LIBV = "1.8.0"
postinst_prologue() {
if ! [ -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"
SRC_URI += "file://no-tests.patch \
file://multilib-fix-clean.patch"
-SRC_URI[archive.md5sum] = "ec3c1f236ee9bd4a982a5f46fcaff7b9"
-SRC_URI[archive.sha256sum] = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe"
+SRC_URI[archive.md5sum] = "8e846804d6e219bc795a26a4a39b5bfd"
+SRC_URI[archive.sha256sum] = "7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821"
#PARALLEL_MAKE = ""