summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-01 15:44:23 +0000
committerRoss Burton <ross@openedhand.com>2007-08-01 15:44:23 +0000
commit1d0a8d783d5c9f1dde853d280dd41d0f66a03d6f (patch)
tree2f64597d29a242c500f31d5204b1b473e6e94257 /meta
parent6f85f7978e1e9fc84fca0db9dc46254f7f1d418a (diff)
downloadpoky-1d0a8d783d5c9f1dde853d280dd41d0f66a03d6f.tar.gz
Upgrade Pango 1.16.x to 1.16.6
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2296 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.16.5/no-tests.patch (renamed from meta/packages/pango/pango-1.16.4/no-tests.patch)0
-rw-r--r--meta/packages/pango/pango_1.16.5.bb (renamed from meta/packages/pango/pango_1.16.4.bb)0
3 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 432cc13092..889e6a9bfd 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -145,7 +145,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.12.13"
145PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 145PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
146PREFERRED_VERSION_atk ?= "1.10.3" 146PREFERRED_VERSION_atk ?= "1.10.3"
147PREFERRED_VERSION_cairo ?= "1.4.8" 147PREFERRED_VERSION_cairo ?= "1.4.8"
148PREFERRED_VERSION_pango ?= "1.16.4" 148PREFERRED_VERSION_pango ?= "1.16.5"
149PREFERRED_VERSION_gtk+ ?= "2.10.14" 149PREFERRED_VERSION_gtk+ ?= "2.10.14"
150 150
151PREFERRED_VERSION_dbus ?= "1.0.2" 151PREFERRED_VERSION_dbus ?= "1.0.2"
diff --git a/meta/packages/pango/pango-1.16.4/no-tests.patch b/meta/packages/pango/pango-1.16.5/no-tests.patch
index dafcb20c3b..dafcb20c3b 100644
--- a/meta/packages/pango/pango-1.16.4/no-tests.patch
+++ b/meta/packages/pango/pango-1.16.5/no-tests.patch
diff --git a/meta/packages/pango/pango_1.16.4.bb b/meta/packages/pango/pango_1.16.5.bb
index 8e3e8e7d3a..8e3e8e7d3a 100644
--- a/meta/packages/pango/pango_1.16.4.bb
+++ b/meta/packages/pango/pango_1.16.5.bb