Upgrade GTK+

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

21 files changed, 28 insertions, 30 deletions

diff --git a/meta/packages/gtk+/gtk+-2.10.6/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.10.6/run-iconcache.patch
deleted file mode 100644
index 5c114dbdda..0000000000
--- a/meta/packages/gtk+/gtk+-2.10.6/run-iconcache.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: gtk+-2.10.6/gtk/Makefile.am
-===================================================================
---- gtk+-2.10.6.orig/gtk/Makefile.am	2006-10-30 12:56:34.000000000 +0000
-+++ gtk+-2.10.6/gtk/Makefile.am	2006-10-30 12:57:08.000000000 +0000
-@@ -1119,11 +1119,11 @@
- 	done									\
- 	&& touch stamp-icons
- 
--gtkbuiltincache.h: @REBUILD@ stamp-icons
--	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
--	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
--	   ./gtk-update-icon-cache --force --ignore-theme-index 		\
--	   --source builtin_icons stock-icons > gtkbuiltincache.h
-+#gtkbuiltincache.h: @REBUILD@ stamp-icons
-+#	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
-+#	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
-+#	   ./gtk-update-icon-cache --force --ignore-theme-index 		\
-+#	   --source builtin_icons stock-icons > gtkbuiltincache.h
- 
- EXTRA_DIST +=                   \
- 	$(STOCK_ICONS)		\
diff --git a/meta/packages/gtk+/gtk+-2.10.6/automake-lossage.patch b/meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch
index 0d423ddbb9..0d423ddbb9 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/automake-lossage.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch
index 4439e69fb6..4439e69fb6 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/cellrenderer-cairo.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/disable-print.patch b/meta/packages/gtk+/gtk+-2.10.9/disable-print.patch
index 1067773f12..1067773f12 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/disable-print.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/disable-print.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch b/meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch
index d71d839c3c..d71d839c3c 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch
index 3313e7f132..3313e7f132 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/entry-cairo.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch b/meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch
index 1ea86ce6b2..1ea86ce6b2 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch
index df29656343..df29656343 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch
index bdbdb32f97..6adb0cfef6 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch
@@ -1,15 +1,15 @@
---- gtk+-2.10.0/configure.in.orig	2006-07-07 09:31:34.000000000 +0100
-+++ gtk+-2.10.0/configure.in	2006-07-07 09:32:49.000000000 +0100
-@@ -370,7 +370,7 @@
- AC_MSG_CHECKING([Whether to write dependencies into .pc files])
+--- /tmp/configure.in	2007-01-08 17:50:49.000000000 +0100
++++ gtk+-2.10.7/configure.in	2007-01-08 17:52:33.495251000 +0100
+@@ -371,7 +371,7 @@
  case $enable_explicit_deps in
    auto)
--    deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh`
-+    deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh`
+     export SED
+-    deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
++    deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo $deplibs_check_method') | sh`
      if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
        enable_explicit_deps=yes  
      else
-@@ -768,7 +768,7 @@
+@@ -773,7 +773,7 @@
      dnl Now we check to see if our libtool supports shared lib deps
      dnl (in a rather ugly way even)
      if $dynworks; then
@@ -18,10 +18,10 @@
          pixbuf_deplibs_check=`$pixbuf_libtool_config | \
              grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
              sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1600,7 +1600,7 @@
- #
+@@ -1611,7 +1611,7 @@
  # We are using gmodule-no-export now, but I'm leaving the stripping
  # code in place for now, since pango and atk still require gmodule.
+ export SED
 -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
 +export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
  if test -n "$export_dynamic"; then
diff --git a/meta/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch
index cfb8849e9f..cfb8849e9f 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/migration.patch b/meta/packages/gtk+/gtk+-2.10.9/migration.patch
index 4ee786e688..4ee786e688 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/migration.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/migration.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/no-demos.patch b/meta/packages/gtk+/gtk+-2.10.9/no-demos.patch
index 0fc4c48d1a..0fc4c48d1a 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/no-demos.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/no-demos.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/no-xwc.patch b/meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch
index affb4a303e..affb4a303e 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/no-xwc.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff
index 63828cec63..63828cec63 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
+++ b/meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff
diff --git a/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch
new file mode 100644
index 0000000000..ac15e9ab24
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch
@@ -0,0 +1,19 @@
+--- /tmp/Makefile.am	2007-01-08 17:44:47.000000000 +0100
++++ gtk+-2.10.7/gtk/Makefile.am	2007-01-08 17:45:17.025251000 +0100
+@@ -1128,11 +1128,11 @@
+ 	   ./gtk-update-icon-cache
+ endif
+ 
+-gtkbuiltincache.h: @REBUILD@ stamp-icons
+-	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+-	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
+-	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+-	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
++#gtkbuiltincache.h: @REBUILD@ stamp-icons
++#	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
++#	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
++#	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
++#	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+ 
+ EXTRA_DIST +=                   \
+ 	$(STOCK_ICONS)		\
diff --git a/meta/packages/gtk+/gtk+-2.10.6/scroll-timings.patch b/meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch
index 3f823a7880..3f823a7880 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/scroll-timings.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/single-click.patch b/meta/packages/gtk+/gtk+-2.10.9/single-click.patch
index 250f1629f5..250f1629f5 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/single-click.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/single-click.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch b/meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch
index 20bf4cf366..20bf4cf366 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch b/meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch
index c26dc6d93c..c26dc6d93c 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/xsettings.patch b/meta/packages/gtk+/gtk+-2.10.9/xsettings.patch
index b63e262d34..b63e262d34 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/xsettings.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/xsettings.patch
diff --git a/meta/packages/gtk+/gtk+_2.10.6.bb b/meta/packages/gtk+/gtk+_2.10.9.bb
index dc762d41cf..dc762d41cf 100644
--- a/meta/packages/gtk+/gtk+_2.10.6.bb
+++ b/meta/packages/gtk+/gtk+_2.10.9.bb