diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-11-26 19:49:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-27 11:56:22 +0000 |
| commit | 22f1eb5165592b47baa35e28c5cb3d4faff36bae (patch) | |
| tree | 428a8a1ea693646d00a1cc233abd2eb91ca331ab | |
| parent | 03f6f0ca01d83f633dcdcd692cc2df7bb0613d72 (diff) | |
| download | openembedded-core-22f1eb5165592b47baa35e28c5cb3d4faff36bae.tar.gz openembedded-core-22f1eb5165592b47baa35e28c5cb3d4faff36bae.tar.bz2 openembedded-core-22f1eb5165592b47baa35e28c5cb3d4faff36bae.zip | |
pango: upgrade to 1.32.6
Drop automake macro patch, merged upstream.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch | 15 | ||||
| -rw-r--r-- | meta/recipes-graphics/pango/pango/multilib-fix-clean.patch (renamed from meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/pango/pango/no-tests.patch (renamed from meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/pango/pango_1.32.5.bb | 17 | ||||
| -rw-r--r-- | meta/recipes-graphics/pango/pango_1.32.6.bb | 12 |
5 files changed, 12 insertions, 32 deletions
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 <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-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-1.32.5/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch index ad414ddf36..ad414ddf36 100644 --- a/meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch +++ b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch diff --git a/meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch b/meta/recipes-graphics/pango/pango/no-tests.patch index ddfc126226..ddfc126226 100644 --- a/meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch +++ b/meta/recipes-graphics/pango/pango/no-tests.patch 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" |