summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-01 15:49:58 +0000
committerRoss Burton <ross@openedhand.com>2007-08-01 15:49:58 +0000
commitfff91ca178a24a09ddb5e638a2710f682357503f (patch)
tree4864e8670b255983f9e803ba6d39f0a1eef7288c
parent1d0a8d783d5c9f1dde853d280dd41d0f66a03d6f (diff)
downloadpoky-fff91ca178a24a09ddb5e638a2710f682357503f.tar.gz
Upgrade bleeding to pango 1.17.5
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2297 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/distro/poky-bleeding.conf2
-rw-r--r--meta/packages/pango/pango-1.17.5/no-tests.patch10
-rw-r--r--meta/packages/pango/pango_1.17.5.bb1
3 files changed, 12 insertions, 1 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index ea574f8bae..799dbffd8c 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -2,7 +2,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.13.7"
2PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 2PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
3 3
4PREFERRED_VERSION_cairo ?= "1.4.8" 4PREFERRED_VERSION_cairo ?= "1.4.8"
5PREFERRED_VERSION_pango ?= "1.16.4" 5PREFERRED_VERSION_pango ?= "1.17.5"
6PREFERRED_VERSION_gtk+ ?= "2.10.14" 6PREFERRED_VERSION_gtk+ ?= "2.10.14"
7PREFERRED_VERSION_gtk-engines ?= "2.10.0" 7PREFERRED_VERSION_gtk-engines ?= "2.10.0"
8 8
diff --git a/meta/packages/pango/pango-1.17.5/no-tests.patch b/meta/packages/pango/pango-1.17.5/no-tests.patch
new file mode 100644
index 0000000000..dafcb20c3b
--- /dev/null
+++ b/meta/packages/pango/pango-1.17.5/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 \
diff --git a/meta/packages/pango/pango_1.17.5.bb b/meta/packages/pango/pango_1.17.5.bb
new file mode 100644
index 0000000000..8e3e8e7d3a
--- /dev/null
+++ b/meta/packages/pango/pango_1.17.5.bb
@@ -0,0 +1 @@
require pango.inc