Upgrade GTK+ from 2.12.0 to 2.12.1

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3012 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index e59bd322fd8c47bcc04fabae18b3cfcdae0af37b..c63aaaa447073d26541db46027cc1e196dd391d4 100644 (file)
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,5 +1,5 @@
 PREFERRED_VERSION_atk ?= "1.20.0"
-PREFERRED_VERSION_gtk+ ?= "2.12.0"
+PREFERRED_VERSION_gtk+ ?= "2.12.1"
 
 PREFERRED_VERSION_gnome-keyring ?= "2.20"
 PREFERRED_VERSION_gnome-vfs ?= "2.20.0"

diff --git a/meta/packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch
rename to meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch b/meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch
rename to meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/disable-print.patch b/meta/packages/gtk+/gtk+-2.12.1/disable-print.patch
similarity index 85%
rename from meta/packages/gtk+/gtk+-2.12.0/disable-print.patch
rename to meta/packages/gtk+/gtk+-2.12.1/disable-print.patch
index 21a4be4da82e574cfb1da87644d4391182d74bbe..19292592d20d21bb9035a815f83f28fa465068b5 100644 (file)
--- a/meta/packages/gtk+/gtk+-2.12.0/disable-print.patch
+++ b/meta/packages/gtk+/gtk+-2.12.1/disable-print.patch
@@ -7,8 +7,8 @@
 -  CUPS_LIBS=`cups-config --libs`
 -
 -  CUPS_API_VERSION=`cups-config --api-version`
--  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
--  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
+-  CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
+-  CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
 -
 -  if test $CUPS_API_MAJOR -gt 1 -o \
 -          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then

diff --git a/meta/packages/gtk+/gtk+-2.12.0/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/entry-cairo.patch
rename to meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
rename to meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch
rename to meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch
rename to meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/no-demos.patch b/meta/packages/gtk+/gtk+-2.12.1/no-demos.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/no-demos.patch
rename to meta/packages/gtk+/gtk+-2.12.1/no-demos.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff
rename to meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff

diff --git a/meta/packages/gtk+/gtk+-2.12.0/range-no-redraw.patch b/meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/range-no-redraw.patch
rename to meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/run-iconcache.patch
rename to meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/scrolled-placement.patch b/meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/scrolled-placement.patch
rename to meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch

diff --git a/meta/packages/gtk+/gtk+-2.12.0/toggle-font.diff b/meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/toggle-font.diff
rename to meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff

diff --git a/meta/packages/gtk+/gtk+-2.12.0/xsettings.patch b/meta/packages/gtk+/gtk+-2.12.1/xsettings.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.12.0/xsettings.patch
rename to meta/packages/gtk+/gtk+-2.12.1/xsettings.patch

diff --git a/meta/packages/gtk+/gtk+_2.12.0.bb b/meta/packages/gtk+/gtk+_2.12.1.bb
similarity index 100%
rename from meta/packages/gtk+/gtk+_2.12.0.bb
rename to meta/packages/gtk+/gtk+_2.12.1.bb