summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-11-12 19:51:08 +0000
committerRoss Burton <ross@openedhand.com>2007-11-12 19:51:08 +0000
commit8075bb569d908755dfa2fa9739387c34b5c51ef1 (patch)
tree45ff8f752aa77149d598c95304a25d50928a501c /meta
parent6648c1349c7559519dcf9c22524616e5d9608cd2 (diff)
downloadpoky-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')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/pango/pango-1.18.3/configure_fixes.patch (renamed from meta/packages/pango/pango-1.18.1/configure_fixes.patch)0
-rw-r--r--meta/packages/pango/pango-1.18.3/no-tests.patch (renamed from meta/packages/pango/pango-1.18.1/no-tests.patch)0
-rw-r--r--meta/packages/pango/pango_1.18.3.bb (renamed from meta/packages/pango/pango_1.18.1.bb)1
4 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ac25f4c406..0ac4d0640f 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -174,7 +174,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.14.3"
174PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 174PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
175PREFERRED_VERSION_atk ?= "1.18.0" 175PREFERRED_VERSION_atk ?= "1.18.0"
176PREFERRED_VERSION_cairo ?= "1.4.10" 176PREFERRED_VERSION_cairo ?= "1.4.10"
177PREFERRED_VERSION_pango ?= "1.18.1" 177PREFERRED_VERSION_pango ?= "1.18.3"
178PREFERRED_VERSION_gtk+ ?= "2.10.14" 178PREFERRED_VERSION_gtk+ ?= "2.10.14"
179 179
180PREFERRED_VERSION_dbus ?= "1.0.2" 180PREFERRED_VERSION_dbus ?= "1.0.2"
diff --git a/meta/packages/pango/pango-1.18.1/configure_fixes.patch b/meta/packages/pango/pango-1.18.3/configure_fixes.patch
index f021591a91..f021591a91 100644
--- a/meta/packages/pango/pango-1.18.1/configure_fixes.patch
+++ b/meta/packages/pango/pango-1.18.3/configure_fixes.patch
diff --git a/meta/packages/pango/pango-1.18.1/no-tests.patch b/meta/packages/pango/pango-1.18.3/no-tests.patch
index dafcb20c3b..dafcb20c3b 100644
--- a/meta/packages/pango/pango-1.18.1/no-tests.patch
+++ b/meta/packages/pango/pango-1.18.3/no-tests.patch
diff --git a/meta/packages/pango/pango_1.18.1.bb b/meta/packages/pango/pango_1.18.3.bb
index c89174b342..8e3e8e7d3a 100644
--- a/meta/packages/pango/pango_1.18.1.bb
+++ b/meta/packages/pango/pango_1.18.3.bb
@@ -1,2 +1 @@
1require pango.inc require pango.inc
2PR = "r1"