Patchwork [2/4] pango: upgrade to 1.32.6

login
register
mail settings
Submitter Ross Burton
Date Nov. 26, 2013, 7:49 p.m.
Message ID <1385495362-20784-2-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/62437/
State New
Headers show

Comments

Ross Burton - Nov. 26, 2013, 7:49 p.m.
Drop automake macro patch, merged upstream.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../pango/pango-1.32.5/obsolete_automake_macros.patch |   15 ---------------
 .../{pango-1.32.5 => pango}/multilib-fix-clean.patch  |    0
 .../pango/{pango-1.32.5 => pango}/no-tests.patch      |    0
 meta/recipes-graphics/pango/pango_1.32.5.bb           |   17 -----------------
 meta/recipes-graphics/pango/pango_1.32.6.bb           |   12 ++++++++++++
 5 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch
 rename meta/recipes-graphics/pango/{pango-1.32.5 => pango}/multilib-fix-clean.patch (100%)
 rename meta/recipes-graphics/pango/{pango-1.32.5 => pango}/no-tests.patch (100%)
 delete mode 100644 meta/recipes-graphics/pango/pango_1.32.5.bb
 create mode 100644 meta/recipes-graphics/pango/pango_1.32.6.bb

Patch

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 3f229b5..0000000
--- 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
similarity index 100%
rename from meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch
rename to 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
similarity index 100%
rename from meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch
rename to 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 6219940..0000000
--- 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 0000000..9c5c1cd
--- /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"