gtk: upgrade to 2.13.3 in bleeding

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

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index ac6fa452f06d15f61846d5a658993c7bdf4dfbd8..cdd16ca2c4adbc301d8494edd0dbde59fdf50d69 100644 (file)
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -2,7 +2,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.17.2"
 PREFERRED_VERSION_glib-2.0-native ?= "2.17.2"
 PREFERRED_VERSION_atk ?= "1.22.0"
 PREFERRED_VERSION_pango ?= "1.21.2"
-PREFERRED_VERSION_gtk+ ?= "2.13.2"
+PREFERRED_VERSION_gtk+ ?= "2.13.3"
 
 require conf/distro/include/poky-floating-revisions.inc
 require conf/distro/poky.conf

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

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

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

diff --git a/meta/packages/gtk+/gtk+-2.13.2/filechooser-default.patch b/meta/packages/gtk+/gtk+-2.13.3/filechooser-default.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.13.2/filechooser-default.patch
rename to meta/packages/gtk+/gtk+-2.13.3/filechooser-default.patch

diff --git a/meta/packages/gtk+/gtk+-2.13.2/filechooser-props.patch b/meta/packages/gtk+/gtk+-2.13.3/filechooser-props.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.13.2/filechooser-props.patch
rename to meta/packages/gtk+/gtk+-2.13.3/filechooser-props.patch

diff --git a/meta/packages/gtk+/gtk+-2.13.2/filechooser-sizefix.patch b/meta/packages/gtk+/gtk+-2.13.3/filechooser-sizefix.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.13.2/filechooser-sizefix.patch
rename to meta/packages/gtk+/gtk+-2.13.3/filechooser-sizefix.patch

diff --git a/meta/packages/gtk+/gtk+-2.13.2/filesystem-volumes.patch b/meta/packages/gtk+/gtk+-2.13.3/filesystem-volumes.patch
similarity index 100%
rename from meta/packages/gtk+/gtk+-2.13.2/filesystem-volumes.patch
rename to meta/packages/gtk+/gtk+-2.13.3/filesystem-volumes.patch

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

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

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

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

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

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

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

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

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

diff --git a/meta/packages/gtk+/gtk+_2.13.2.bb b/meta/packages/gtk+/gtk+_2.13.3.bb
similarity index 97%
rename from meta/packages/gtk+/gtk+_2.13.2.bb
rename to meta/packages/gtk+/gtk+_2.13.3.bb
index 8d0994fd1da6c4bf862c95182b7f9904fb1a11ff..c716c5b76a90fc65221c5c39feefb34f0b7ab626 100644 (file)
--- a/meta/packages/gtk+/gtk+_2.13.2.bb
+++ b/meta/packages/gtk+/gtk+_2.13.3.bb
@@ -10,8 +10,8 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.13/gtk+-${PV}.tar.bz2 \
            file://cellrenderer-cairo.patch;patch=1;pnum=0 \
            file://entry-cairo.patch;patch=1;pnum=0 \
            file://toggle-font.diff;patch=1;pnum=0 \
-           file://filesystem-volumes.patch;patch=1 \
 # TO MERGE
+#           file://filesystem-volumes.patch;patch=1 \
 #           file://filechooser-props.patch;patch=1 \
 #           file://filechooser-default.patch;patch=1 \
 #           file://filechooser-sizefix.patch;patch=1 \