diff options
author | Yu Ke <ke.yu@intel.com> | 2010-07-03 21:49:22 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-05 13:29:48 +0100 |
commit | 52759ea5774bb907cb882c78286bda36c0fdbd3a (patch) | |
tree | 7e1c0f2424ccf08a07aa71da34b24dbb05d626df /meta/packages/pango/pango-1.22.2 | |
parent | 8f88fd5483a8d784249d588c84c55b56159f07a3 (diff) | |
download | poky-52759ea5774bb907cb882c78286bda36c0fdbd3a.tar.gz |
pango: upgrade to version 1.28.0
when upgrade to 1.28.0, the local patch no-introspect.patch
is removed, since it is already in 1.28.0 upstream.
this patch also fix the meta data, and change the field order
according to the style guide.
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta/packages/pango/pango-1.22.2')
-rw-r--r-- | meta/packages/pango/pango-1.22.2/doublefix.patch | 17 | ||||
-rw-r--r-- | meta/packages/pango/pango-1.22.2/no-tests.patch | 12 |
2 files changed, 0 insertions, 29 deletions
diff --git a/meta/packages/pango/pango-1.22.2/doublefix.patch b/meta/packages/pango/pango-1.22.2/doublefix.patch deleted file mode 100644 index 876f62ab39..0000000000 --- a/meta/packages/pango/pango-1.22.2/doublefix.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Fix double header inclusion for bug with recent autoconf/automake | ||
2 | |||
3 | RP 4/2/10 | ||
4 | |||
5 | Index: 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/no-tests.patch b/meta/packages/pango/pango-1.22.2/no-tests.patch deleted file mode 100644 index 4a74d8c4d6..0000000000 --- a/meta/packages/pango/pango-1.22.2/no-tests.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: pango-1.22.2/Makefile.am | ||
2 | =================================================================== | ||
3 | --- pango-1.22.2.orig/Makefile.am | ||
4 | +++ pango-1.22.2/Makefile.am | ||
5 | @@ -1,6 +1,6 @@ | ||
6 | ## Process this file with automake to create Makefile.in. | ||
7 | |||
8 | -SUBDIRS= pango modules pango-view examples docs tools tests | ||
9 | +SUBDIRS= pango modules pango-view examples docs tools | ||
10 | |||
11 | EXTRA_DIST = \ | ||
12 | autogen.sh \ | ||