From 8cc540dc14f721ab4d8ba0e7e97a9ca2e9b8e8fe Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 31 Aug 2007 14:53:40 +0000 Subject: Upgrade pango to latest stable release, 1.18.2 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2611 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky-bleeding.conf | 1 - meta/conf/distro/poky.conf | 2 +- meta/packages/pango/pango-1.17.5/no-tests.patch | 10 ---------- meta/packages/pango/pango-1.18.1/no-tests.patch | 10 ++++++++++ meta/packages/pango/pango_1.17.5.bb | 1 - meta/packages/pango/pango_1.18.1.bb | 1 + 6 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 meta/packages/pango/pango-1.17.5/no-tests.patch create mode 100644 meta/packages/pango/pango-1.18.1/no-tests.patch delete mode 100644 meta/packages/pango/pango_1.17.5.bb create mode 100644 meta/packages/pango/pango_1.18.1.bb (limited to 'meta') diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 0b59df5823..921545f288 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf @@ -1,4 +1,3 @@ -PREFERRED_VERSION_pango ?= "1.17.5" PREFERRED_VERSION_gtk+ ?= "2.11.6" require conf/distro/poky.conf diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 4c3a0c3074..4daeaee23f 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -159,7 +159,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.14.0" PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" PREFERRED_VERSION_atk ?= "1.18.0" PREFERRED_VERSION_cairo ?= "1.4.10" -PREFERRED_VERSION_pango ?= "1.16.5" +PREFERRED_VERSION_pango ?= "1.18.1" PREFERRED_VERSION_gtk+ ?= "2.10.14" PREFERRED_VERSION_dbus ?= "1.0.2" diff --git a/meta/packages/pango/pango-1.17.5/no-tests.patch b/meta/packages/pango/pango-1.17.5/no-tests.patch deleted file mode 100644 index dafcb20c3b..0000000000 --- a/meta/packages/pango/pango-1.17.5/no-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 -+++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango modules pango-view examples docs tools tests -+SUBDIRS= pango modules pango-view examples docs tools - - EXTRA_DIST = \ - autogen.sh \ diff --git a/meta/packages/pango/pango-1.18.1/no-tests.patch b/meta/packages/pango/pango-1.18.1/no-tests.patch new file mode 100644 index 0000000000..dafcb20c3b --- /dev/null +++ b/meta/packages/pango/pango-1.18.1/no-tests.patch @@ -0,0 +1,10 @@ +--- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 ++++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 +@@ -1,6 +1,6 @@ + ## Process this file with automake to create Makefile.in. + +-SUBDIRS= pango modules pango-view examples docs tools tests ++SUBDIRS= pango modules pango-view examples docs tools + + EXTRA_DIST = \ + autogen.sh \ diff --git a/meta/packages/pango/pango_1.17.5.bb b/meta/packages/pango/pango_1.17.5.bb deleted file mode 100644 index 8e3e8e7d3a..0000000000 --- a/meta/packages/pango/pango_1.17.5.bb +++ /dev/null @@ -1 +0,0 @@ -require pango.inc diff --git a/meta/packages/pango/pango_1.18.1.bb b/meta/packages/pango/pango_1.18.1.bb new file mode 100644 index 0000000000..8e3e8e7d3a --- /dev/null +++ b/meta/packages/pango/pango_1.18.1.bb @@ -0,0 +1 @@ +require pango.inc -- cgit v1.2.3