summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/pango/pango-1.22.2/doublefix.patch17
-rw-r--r--meta/packages/pango/pango_1.22.2.bb3
2 files changed, 20 insertions, 0 deletions
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
index 0000000000..876f62ab39
--- /dev/null
+++ b/meta/packages/pango/pango-1.22.2/doublefix.patch
@@ -0,0 +1,17 @@
1Fix double header inclusion for bug with recent autoconf/automake
2
3RP 4/2/10
4
5Index: pango-1.22.2/pango/Makefile.am
6===================================================================
7--- pango-1.22.2.orig/pango/Makefile.am 2010-02-04 12:05:30.000000000 +0000
8+++ pango-1.22.2/pango/Makefile.am 2010-02-04 12:07:21.000000000 +0000
9@@ -233,7 +233,7 @@
10 # ------------------- libpangoxft -------------------
11
12 if HAVE_XFT
13-pangoinclude_HEADERS += pangoxft.h pangoxft-render.h pango-ot.h
14+pangoinclude_HEADERS += pangoxft.h pangoxft-render.h
15 lib_LTLIBRARIES += libpangoxft-1.0.la
16 endif
17
diff --git a/meta/packages/pango/pango_1.22.2.bb b/meta/packages/pango/pango_1.22.2.bb
index be37e8f76b..14153db1ac 100644
--- a/meta/packages/pango/pango_1.22.2.bb
+++ b/meta/packages/pango/pango_1.22.2.bb
@@ -1,3 +1,6 @@
1require pango.inc 1require pango.inc
2 2
3SRC_URI += "file://no-tests.patch;patch=1" 3SRC_URI += "file://no-tests.patch;patch=1"
4SRC_URI += "file://doublefix.patch;patch=1"
5
6PR = "r1"