[oe-commits] Marko Lindqvist : pango: replace obsolete automake macros with working ones

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 16df16408719b93f595412a4c10df793d847dd19
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=16df16408719b93f595412a4c10df793d847dd19

Author: Marko Lindqvist <cazfi74 at gmail.com>
Date:   Tue Jan 15 13:44:44 2013 +0200

pango: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../pango-1.32.5/obsolete_automake_macros.patch    |   15 +++++++++++++++
 meta/recipes-graphics/pango/pango_1.32.5.bb        |    6 ++++--
 2 files changed, 19 insertions(+), 2 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
new file mode 100644
index 0000000..3f229b5
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691263]
+
+Signed-off-by: Marko Lindqvist <cazfi74 at 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.bb b/meta/recipes-graphics/pango/pango_1.32.5.bb
index e71f514..fe93b52 100644
--- a/meta/recipes-graphics/pango/pango_1.32.5.bb
+++ b/meta/recipes-graphics/pango/pango_1.32.5.bb
@@ -2,12 +2,14 @@ require pango.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r0"
+PR = "r1"
 
 GNOME_COMPRESS_TYPE="xz"
 
 SRC_URI += "file://no-tests.patch \
-            file://multilib-fix-clean.patch"
+            file://multilib-fix-clean.patch \
+            file://obsolete_automake_macros.patch \
+"
 
 SRC_URI[archive.md5sum] = "8e846804d6e219bc795a26a4a39b5bfd"
 SRC_URI[archive.sha256sum] = "7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821"