From d5dd359bb4ce401acb0edac9334800742dffdca6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 13 Mar 2007 09:24:05 +0000 Subject: [PATCH] Upgrade to latest GTK+ and Pango git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1337 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky-bleeding.conf | 4 ++-- .../gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/automake-lossage.patch | 0 .../gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/cellrenderer-cairo.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/disable-print.patch | 0 .../gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/disable-tooltips.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/entry-cairo.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/gtk+-handhelds.patch | 0 .../packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/gtklabel-resize-patch | 0 .../gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/hardcoded_libtool.patch | 0 .../packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/menu-deactivate.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/migration.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/no-demos.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/no-xwc.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/pangoxft2.10.6.diff | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/run-iconcache.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/scroll-timings.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/single-click.patch | 0 .../gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/small-gtkfilesel.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/spinbutton.patch | 0 meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/xsettings.patch | 0 meta/packages/gtk+/{gtk+_2.10.9.bb => gtk+_2.10.10.bb} | 0 meta/packages/pango/{pango-1.16.0 => pango-1.16.1}/no-tests.patch | 0 meta/packages/pango/{pango_1.16.0.bb => pango_1.16.1.bb} | 0 23 files changed, 2 insertions(+), 2 deletions(-) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/automake-lossage.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/cellrenderer-cairo.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/disable-print.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/disable-tooltips.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/entry-cairo.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/gtk+-handhelds.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/gtklabel-resize-patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/hardcoded_libtool.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/menu-deactivate.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/migration.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/no-demos.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/no-xwc.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/pangoxft2.10.6.diff (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/run-iconcache.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/scroll-timings.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/single-click.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/small-gtkfilesel.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/spinbutton.patch (100%) rename meta/packages/gtk+/{gtk+-2.10.9 => gtk+-2.10.10}/xsettings.patch (100%) rename meta/packages/gtk+/{gtk+_2.10.9.bb => gtk+_2.10.10.bb} (100%) rename meta/packages/pango/{pango-1.16.0 => pango-1.16.1}/no-tests.patch (100%) rename meta/packages/pango/{pango_1.16.0.bb => pango_1.16.1.bb} (100%) diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 1f88b54..4396d42 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.12.11" PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" PREFERRED_VERSION_cairo ?= "1.4.0" -PREFERRED_VERSION_pango ?= "1.16.0" -PREFERRED_VERSION_gtk+ ?= "2.10.9" +PREFERRED_VERSION_pango ?= "1.16.1" +PREFERRED_VERSION_gtk+ ?= "2.10.10" require conf/distro/poky.conf diff --git a/meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch b/meta/packages/gtk+/gtk+-2.10.10/automake-lossage.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch rename to meta/packages/gtk+/gtk+-2.10.10/automake-lossage.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.10.10/cellrenderer-cairo.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch rename to meta/packages/gtk+/gtk+-2.10.10/cellrenderer-cairo.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/disable-print.patch b/meta/packages/gtk+/gtk+-2.10.10/disable-print.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/disable-print.patch rename to meta/packages/gtk+/gtk+-2.10.10/disable-print.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch b/meta/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch rename to meta/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.10.10/entry-cairo.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch rename to meta/packages/gtk+/gtk+-2.10.10/entry-cairo.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch b/meta/packages/gtk+/gtk+-2.10.10/gtk+-handhelds.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch rename to meta/packages/gtk+/gtk+-2.10.10/gtk+-handhelds.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.10.10/gtklabel-resize-patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch rename to meta/packages/gtk+/gtk+-2.10.10/gtklabel-resize-patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.10.10/hardcoded_libtool.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch rename to meta/packages/gtk+/gtk+-2.10.10/hardcoded_libtool.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.10.10/menu-deactivate.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch rename to meta/packages/gtk+/gtk+-2.10.10/menu-deactivate.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/migration.patch b/meta/packages/gtk+/gtk+-2.10.10/migration.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/migration.patch rename to meta/packages/gtk+/gtk+-2.10.10/migration.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/no-demos.patch b/meta/packages/gtk+/gtk+-2.10.10/no-demos.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/no-demos.patch rename to meta/packages/gtk+/gtk+-2.10.10/no-demos.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch b/meta/packages/gtk+/gtk+-2.10.10/no-xwc.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch rename to meta/packages/gtk+/gtk+-2.10.10/no-xwc.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.10.10/pangoxft2.10.6.diff similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff rename to meta/packages/gtk+/gtk+-2.10.10/pangoxft2.10.6.diff diff --git a/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.10.10/run-iconcache.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch rename to meta/packages/gtk+/gtk+-2.10.10/run-iconcache.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch b/meta/packages/gtk+/gtk+-2.10.10/scroll-timings.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch rename to meta/packages/gtk+/gtk+-2.10.10/scroll-timings.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/single-click.patch b/meta/packages/gtk+/gtk+-2.10.10/single-click.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/single-click.patch rename to meta/packages/gtk+/gtk+-2.10.10/single-click.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch b/meta/packages/gtk+/gtk+-2.10.10/small-gtkfilesel.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch rename to meta/packages/gtk+/gtk+-2.10.10/small-gtkfilesel.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch b/meta/packages/gtk+/gtk+-2.10.10/spinbutton.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch rename to meta/packages/gtk+/gtk+-2.10.10/spinbutton.patch diff --git a/meta/packages/gtk+/gtk+-2.10.9/xsettings.patch b/meta/packages/gtk+/gtk+-2.10.10/xsettings.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.10.9/xsettings.patch rename to meta/packages/gtk+/gtk+-2.10.10/xsettings.patch diff --git a/meta/packages/gtk+/gtk+_2.10.9.bb b/meta/packages/gtk+/gtk+_2.10.10.bb similarity index 100% rename from meta/packages/gtk+/gtk+_2.10.9.bb rename to meta/packages/gtk+/gtk+_2.10.10.bb diff --git a/meta/packages/pango/pango-1.16.0/no-tests.patch b/meta/packages/pango/pango-1.16.1/no-tests.patch similarity index 100% rename from meta/packages/pango/pango-1.16.0/no-tests.patch rename to meta/packages/pango/pango-1.16.1/no-tests.patch diff --git a/meta/packages/pango/pango_1.16.0.bb b/meta/packages/pango/pango_1.16.1.bb similarity index 100% rename from meta/packages/pango/pango_1.16.0.bb rename to meta/packages/pango/pango_1.16.1.bb -- 2.7.4