pango-1.22.2: Fix autoconf/automake issue with double header reference

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/pango/pango-1.22.2/doublefix.patch b/meta/packages/pango/pango-1.22.2/doublefix.patch
new file mode 100644 (file)
index 0000000..876f62a
--- /dev/null
+++ b/meta/packages/pango/pango-1.22.2/doublefix.patch
@@ -0,0 +1,17 @@
+Fix double header inclusion for bug with recent autoconf/automake
+
+RP 4/2/10
+
+Index: pango-1.22.2/pango/Makefile.am
+===================================================================
+--- pango-1.22.2.orig/pango/Makefile.am        2010-02-04 12:05:30.000000000 +0000
++++ pango-1.22.2/pango/Makefile.am     2010-02-04 12:07:21.000000000 +0000
+@@ -233,7 +233,7 @@
+ # ------------------- libpangoxft -------------------
+ 
+ if HAVE_XFT
+-pangoinclude_HEADERS += pangoxft.h pangoxft-render.h pango-ot.h
++pangoinclude_HEADERS += pangoxft.h pangoxft-render.h
+ lib_LTLIBRARIES += libpangoxft-1.0.la
+ endif
+ 

diff --git a/meta/packages/pango/pango_1.22.2.bb b/meta/packages/pango/pango_1.22.2.bb
index be37e8f76bdd64748adb308f1520f48dec498dc0..14153db1acc4654eaee8318d6b135ffe155a297e 100644 (file)
--- a/meta/packages/pango/pango_1.22.2.bb
+++ b/meta/packages/pango/pango_1.22.2.bb
@@ -1,3 +1,6 @@
 require pango.inc
 
 SRC_URI += "file://no-tests.patch;patch=1"
+SRC_URI += "file://doublefix.patch;patch=1"
+
+PR = "r1"