From 22f1eb5165592b47baa35e28c5cb3d4faff36bae Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 26 Nov 2013 19:49:20 +0000 Subject: pango: upgrade to 1.32.6 Drop automake macro patch, merged upstream. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../pango/pango-1.32.5/multilib-fix-clean.patch | 75 ---------------------- .../pango/pango-1.32.5/no-tests.patch | 15 ----- .../pango-1.32.5/obsolete_automake_macros.patch | 15 ----- .../pango/pango/multilib-fix-clean.patch | 75 ++++++++++++++++++++++ meta/recipes-graphics/pango/pango/no-tests.patch | 15 +++++ meta/recipes-graphics/pango/pango_1.32.5.bb | 17 ----- meta/recipes-graphics/pango/pango_1.32.6.bb | 12 ++++ 7 files changed, 102 insertions(+), 122 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch delete mode 100644 meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch delete mode 100644 meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch create mode 100644 meta/recipes-graphics/pango/pango/multilib-fix-clean.patch create mode 100644 meta/recipes-graphics/pango/pango/no-tests.patch delete mode 100644 meta/recipes-graphics/pango/pango_1.32.5.bb create mode 100644 meta/recipes-graphics/pango/pango_1.32.6.bb 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 deleted file mode 100644 index ad414ddf36..0000000000 --- a/meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Pending - -Updated to apply to pango-1.32.5 - -Signed-off-by: Marko Lindqvist -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=], [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.32.5/no-tests.patch b/meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch deleted file mode 100644 index ddfc126226..0000000000 --- a/meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -Signed-off-by: Radu Moisan -Upstream-Status: Pending - -Index: pango-1.30.0/Makefile.am -=================================================================== ---- pango-1.30.0.orig/Makefile.am 2011-08-16 04:11:08.000000000 +0300 -+++ pango-1.30.0/Makefile.am 2012-08-06 12:48:27.000000000 +0300 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango modules pango-view examples docs tools tests build -+SUBDIRS= pango modules pango-view examples docs tools build - - EXTRA_DIST = \ - autogen.sh \ diff --git a/meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch b/meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch deleted file mode 100644 index 3f229b5e42..0000000000 --- a/meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691263] - -Signed-off-by: Marko Lindqvist -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-07 03:25:42.734109587 +0200 -@@ -54,7 +54,7 @@ - dnl usage of GNU Make specific features. - AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability) - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - - PANGO_VERSION_MAJOR=pango_version_major() diff --git a/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch new file mode 100644 index 0000000000..ad414ddf36 --- /dev/null +++ b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch @@ -0,0 +1,75 @@ +Upstream-Status: Pending + +Updated to apply to pango-1.32.5 + +Signed-off-by: Marko Lindqvist +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=], [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/no-tests.patch b/meta/recipes-graphics/pango/pango/no-tests.patch new file mode 100644 index 0000000000..ddfc126226 --- /dev/null +++ b/meta/recipes-graphics/pango/pango/no-tests.patch @@ -0,0 +1,15 @@ +Signed-off-by: Radu Moisan +Upstream-Status: Pending + +Index: pango-1.30.0/Makefile.am +=================================================================== +--- pango-1.30.0.orig/Makefile.am 2011-08-16 04:11:08.000000000 +0300 ++++ pango-1.30.0/Makefile.am 2012-08-06 12:48:27.000000000 +0300 +@@ -1,6 +1,6 @@ + ## Process this file with automake to create Makefile.in. + +-SUBDIRS= pango modules pango-view examples docs tools tests build ++SUBDIRS= pango modules pango-view examples docs tools build + + EXTRA_DIST = \ + autogen.sh \ diff --git a/meta/recipes-graphics/pango/pango_1.32.5.bb b/meta/recipes-graphics/pango/pango_1.32.5.bb deleted file mode 100644 index 6219940b5f..0000000000 --- a/meta/recipes-graphics/pango/pango_1.32.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -require pango.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -PR = "r2" - -GNOME_COMPRESS_TYPE="xz" - -SRC_URI += "file://no-tests.patch \ - file://multilib-fix-clean.patch \ - file://obsolete_automake_macros.patch \ -" - -SRC_URI[archive.md5sum] = "8e846804d6e219bc795a26a4a39b5bfd" -SRC_URI[archive.sha256sum] = "7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821" - -#PARALLEL_MAKE = "" diff --git a/meta/recipes-graphics/pango/pango_1.32.6.bb b/meta/recipes-graphics/pango/pango_1.32.6.bb new file mode 100644 index 0000000000..9c5c1cde8a --- /dev/null +++ b/meta/recipes-graphics/pango/pango_1.32.6.bb @@ -0,0 +1,12 @@ +require pango.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +GNOME_COMPRESS_TYPE="xz" + +SRC_URI += "file://no-tests.patch \ + file://multilib-fix-clean.patch \ +" + +SRC_URI[archive.md5sum] = "1af2e3a0ac5a258eff5ceddb6ed60ebd" +SRC_URI[archive.sha256sum] = "8e9a3eadebf30a31640f2b3ae0fb455cf92d10d1cad246d0ffe72ec595905174" -- cgit v1.2.3