diff options
author | Ross Burton <ross@openedhand.com> | 2007-11-12 19:51:08 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2007-11-12 19:51:08 +0000 |
commit | 8075bb569d908755dfa2fa9739387c34b5c51ef1 (patch) | |
tree | 45ff8f752aa77149d598c95304a25d50928a501c /meta/packages/pango/pango-1.18.3 | |
parent | 6648c1349c7559519dcf9c22524616e5d9608cd2 (diff) | |
download | poky-8075bb569d908755dfa2fa9739387c34b5c51ef1.tar.gz |
Upgrade pango from 1.8.1 to 1.8.3
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3135 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/pango/pango-1.18.3')
-rw-r--r-- | meta/packages/pango/pango-1.18.3/configure_fixes.patch | 79 | ||||
-rw-r--r-- | meta/packages/pango/pango-1.18.3/no-tests.patch | 10 |
2 files changed, 89 insertions, 0 deletions
diff --git a/meta/packages/pango/pango-1.18.3/configure_fixes.patch b/meta/packages/pango/pango-1.18.3/configure_fixes.patch new file mode 100644 index 0000000000..f021591a91 --- /dev/null +++ b/meta/packages/pango/pango-1.18.3/configure_fixes.patch | |||
@@ -0,0 +1,79 @@ | |||
1 | Index: pango-1.18.1/configure.in | ||
2 | =================================================================== | ||
3 | --- pango-1.18.1.orig/configure.in 2007-08-28 00:29:54.000000000 +0000 | ||
4 | +++ pango-1.18.1/configure.in 2007-11-12 19:21:22.000000000 +0000 | ||
5 | @@ -226,13 +226,9 @@ | ||
6 | # | ||
7 | # Checks for FreeType | ||
8 | # | ||
9 | - FREETYPE_LIBS= | ||
10 | - FREETYPE_CFLAGS= | ||
11 | - AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) | ||
12 | - if test "x$FREETYPE_CONFIG" != "xno" ; then | ||
13 | - FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` | ||
14 | - FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` | ||
15 | + PKG_CHECK_MODULES(FREETYPE, freetype2 >= 1.0.1, have_freetype=true, AC_MSG_RESULT([no])) | ||
16 | |||
17 | + if $have_freetype ; then | ||
18 | pango_save_ldflags=$LDFLAGS | ||
19 | LDFLAGS="$LDFLAGS $FREETYPE_LIBS" | ||
20 | AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :) | ||
21 | Index: pango-1.18.1/pangoft2-uninstalled.pc.in | ||
22 | =================================================================== | ||
23 | --- pango-1.18.1.orig/pangoft2-uninstalled.pc.in 2007-07-05 21:30:28.000000000 +0000 | ||
24 | +++ pango-1.18.1/pangoft2-uninstalled.pc.in 2007-11-12 19:23:44.000000000 +0000 | ||
25 | @@ -1,7 +1,7 @@ | ||
26 | Name: Pango FT2 Uninstalled | ||
27 | Description: Freetype 2.0 font support for Pango, Not Installed | ||
28 | Version: @VERSION@ | ||
29 | -Requires: pango | ||
30 | -Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la @FREETYPE_LIBS@ | ||
31 | -Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@ | ||
32 | +Requires: pango freetype2 | ||
33 | +Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la | ||
34 | +Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ | ||
35 | |||
36 | Index: pango-1.18.1/pangoft2.pc.in | ||
37 | =================================================================== | ||
38 | --- pango-1.18.1.orig/pangoft2.pc.in 2007-07-05 21:30:28.000000000 +0000 | ||
39 | +++ pango-1.18.1/pangoft2.pc.in 2007-11-12 19:27:05.000000000 +0000 | ||
40 | @@ -6,7 +6,7 @@ | ||
41 | Name: Pango FT2 | ||
42 | Description: Freetype 2.0 font support for Pango | ||
43 | Version: @VERSION@ | ||
44 | -Requires: pango | ||
45 | -Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@ | ||
46 | -Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@ | ||
47 | +Requires: pango freetype2 fontconfig | ||
48 | +Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ | ||
49 | +Cflags: -I${includedir}/pango-1.0 | ||
50 | |||
51 | Index: pango-1.18.1/pangoxft-uninstalled.pc.in | ||
52 | =================================================================== | ||
53 | --- pango-1.18.1.orig/pangoxft-uninstalled.pc.in 2007-07-05 21:30:28.000000000 +0000 | ||
54 | +++ pango-1.18.1/pangoxft-uninstalled.pc.in 2007-11-12 19:22:24.000000000 +0000 | ||
55 | @@ -1,7 +1,7 @@ | ||
56 | Name: Pango Xft Uninstalled | ||
57 | Description: Xft font support for Pango, Not Installed | ||
58 | Version: @VERSION@ | ||
59 | -Requires: pango | ||
60 | -Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @XFT_LIBS@ | ||
61 | -Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@ | ||
62 | +Requires: pango xft | ||
63 | +Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la | ||
64 | +Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ | ||
65 | |||
66 | Index: pango-1.18.1/pangoxft.pc.in | ||
67 | =================================================================== | ||
68 | --- pango-1.18.1.orig/pangoxft.pc.in 2007-07-05 21:30:28.000000000 +0000 | ||
69 | +++ pango-1.18.1/pangoxft.pc.in 2007-11-12 19:21:57.000000000 +0000 | ||
70 | @@ -6,6 +6,6 @@ | ||
71 | Name: Pango Xft | ||
72 | Description: Xft font support for Pango | ||
73 | Version: @VERSION@ | ||
74 | -Requires: pango pangoft2 | ||
75 | -Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@ | ||
76 | -Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@ | ||
77 | +Requires: pango pangoft2 xft | ||
78 | +Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ | ||
79 | +Cflags: -I${includedir}/pango-1.0 | ||
diff --git a/meta/packages/pango/pango-1.18.3/no-tests.patch b/meta/packages/pango/pango-1.18.3/no-tests.patch new file mode 100644 index 0000000000..dafcb20c3b --- /dev/null +++ b/meta/packages/pango/pango-1.18.3/no-tests.patch | |||
@@ -0,0 +1,10 @@ | |||
1 | --- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 | ||
2 | +++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 | ||
3 | @@ -1,6 +1,6 @@ | ||
4 | ## Process this file with automake to create Makefile.in. | ||
5 | |||
6 | -SUBDIRS= pango modules pango-view examples docs tools tests | ||
7 | +SUBDIRS= pango modules pango-view examples docs tools | ||
8 | |||
9 | EXTRA_DIST = \ | ||
10 | autogen.sh \ | ||