Really adding needed patches, thanks Kaleb Elwert and Lars Wendler for reporting.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 242 insertions, 5 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 400a95459801..e9b10d1f87b1 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.458 2010/06/13 15:43:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.459 2010/06/13 18:47:29 pacho Exp $
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +files/gtk+-2.20.1-GtkOffscreenWindow.patch,
+  +files/gtk+-2.20.1-gail_cell_type.patch,
+  +files/gtk+-2.20.1-gtkrange.patch,
+  +files/gtk+-2.20.1-libpixbufloader-warning.patch,
+  +files/gtk+-2.20.1-libpng-fix.patch:
+  Really adding needed patches, thanks Kaleb Elwert and Lars Wendler for
+  reporting.
 
 *gtk+-2.20.1-r1 (13 Jun 2010)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 805823d148a8..05c7d21f900d 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -12,6 +12,11 @@ AUX gtk+-2.16.6-fix-pltcheck-test.patch 567 RMD160 5f17d717cd7479fb477c8be407ce4
 AUX gtk+-2.18.5-macosx-aqua.patch 5521 RMD160 2f61c470952043229de027b23f67f634eaa86ffa SHA1 b0babc33bc3abca2069a5674996aeffd6fbf4120 SHA256 53cab4a8880c1add44304c7bdb83831adc16b69d938759ab3fc996d744d9e5b6
 AUX gtk+-2.18.7-destroy-crash.patch 1236 RMD160 e266ee532854f01a7b6dbcf61626d83e2133d0b2 SHA1 76671cca0245d8b0e25acb43eb6f65442461a573 SHA256 61ead70a439f873cc66676ef8a0b4076d2c0f44534c1e5d8898c42ef3a659b33
 AUX gtk+-2.18.9-notifications-gtkentry.patch 1274 RMD160 d397d677b76be6ea2614b33c328dcd5d237423f1 SHA1 1f9b4de6827798f7358b38ede143d2d29482a06c SHA256 fd656e194d3e734d21b6afd0d8cf9e002679d8f41da73ec41790341a0d355798
+AUX gtk+-2.20.1-GtkOffscreenWindow.patch 942 RMD160 b6cb30a8c9ced7ccbbf979c8e04373147ec12c71 SHA1 b4e43ecaf84a0c22fb51d150d0b19a50b12a7d55 SHA256 6a3c8f0d18c6f5b824712c404de33d01313faaa537b9caddd50622ccaf176b7c
+AUX gtk+-2.20.1-gail_cell_type.patch 2654 RMD160 1944303b539f52597c8e7dde409fa031adb1983b SHA1 8f163caf88cdd37ef2a74d750ebbc8831f5c42eb SHA256 0419bd47daadd11daf08829f8a9091f8510a2a45b9a82a8e33553ba460b07cbc
+AUX gtk+-2.20.1-gtkrange.patch 1266 RMD160 083f230d14be1bdae52a1c4d3563bcda41f6f88a SHA1 44d09fa98d9445571f0ad02fb938026704fff160 SHA256 b96bc9a669a3c941f65835fa4014ac458381afe6a003e833281a88da6e08d7af
+AUX gtk+-2.20.1-libpixbufloader-warning.patch 1633 RMD160 4535f72c05826ef14f4445f02ebc2fe930443711 SHA1 e579b8b10c79ca1f58dc2274e8df7d0e8d1b702d SHA256 800361dce46bef0b1a47b9614a55bc4789a32bed144324116fc00d7dec17844a
+AUX gtk+-2.20.1-libpng-fix.patch 2404 RMD160 0c5e577c8312585bcbdca2aff4e583200c3ea6ef SHA1 dcd9fdbb734efaacb067ce150acd4fa00ffc9feb SHA256 217456702e04bac746ee6139192596309541583fbc00103e894ed42e98469edd
 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
@@ -27,12 +32,12 @@ EBUILD gtk+-2.18.6.ebuild 5680 RMD160 a3bd7b9ca61f298d0164a53cde2c5e220d669836 S
 EBUILD gtk+-2.18.7.ebuild 5883 RMD160 1f8f3ad8ba596d2ace059cad8d838af8f569ceb7 SHA1 2658f1b41c1648c312d1b5de24c6190be1d1447f SHA256 3f392441329741992c57cb4d39240b47d55d1b03402399ebe0628541e94049df
 EBUILD gtk+-2.18.9.ebuild 5911 RMD160 9962654dbda4b4b9bbbae60224c3f2f6f5f0e529 SHA1 d326d6e98f51cdc05f3a5c5944b4e40b94705dc3 SHA256 a18900545cf91cea1bd7552659ad5512de87ab1e714f1730f2871ed4e6289b19
 EBUILD gtk+-2.20.1-r1.ebuild 6296 RMD160 e19c2fc18f47355ec1d0e1dc7d7420fdeb317478 SHA1 8f4a5fd52cfbe952bd3ee116d0ed044a3172f6ec SHA256 0145ed396c899822123df374c42f6990c6141f6a480692f586e93d44dc577843
-MISC ChangeLog 67369 RMD160 7e15cc66200dfa873bfc87fa9019559d2133fc16 SHA1 656ebf372bdcf6815c0e1faf74978e5ed12cf0dc SHA256 6b70f0ae7d38bf5be20f6db173a3e6d346ed05028012d82209bce3ffb44eec48
+MISC ChangeLog 67720 RMD160 becc698c0847af8a081d015cea52a65437cceac0 SHA1 fd8c080b53af2fd52b32375214a830761ef01efb SHA256 67e312afc409eb69c8f2765e9e103e1105de236b7811808827e13af925121fbd
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwU/LUACgkQCaWpQKGI+9SXHACcDAWAma8dH/YoHs6V7YW8XK91
-HfsAnjMTJTyceHrfo6nTbTMqutCDPMLk
-=jkQw
+iEYEARECAAYFAkwVJ8YACgkQCaWpQKGI+9R+EQCghzCVqWJOHawi2fZUYPvW9U+m
+1l4An0M5ubDaK4qw3UynGTAsikKqzJHq
+=UwFR
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch b/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch
new file mode 100644
index 000000000000..7845bfa478c5
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch
@@ -0,0 +1,26 @@
+From 4cf1f2c55c8d27052e43da932a5d5444bf1ed1f6 Mon Sep 17 00:00:00 2001
+From: Cody Russell <bratsche@gnome.org>
+Date: Tue, 01 Jun 2010 15:32:18 +0000
+Subject: Bug 608218 - GtkOffscreenWindow causes bad window with GtkEntry
+
+We now exit early from gdk_window_register_dnd() to avoid crashing if the
+window type is GDK_WINDOW_OFFSCREEN and does not support dnd operations.
+This makes it possible to use any dnd-enabled widgets, such as GtkEntry,
+within a GtkOffscreenWindow.
+---
+diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
+index 4b7fd85..c0ad26d 100644
+--- a/gdk/x11/gdkdnd-x11.c
++++ b/gdk/x11/gdkdnd-x11.c
+@@ -3879,6 +3879,9 @@ gdk_window_register_dnd (GdkWindow      *window)
+ 
+   g_return_if_fail (window != NULL);
+ 
++  if (gdk_window_get_window_type (window) == GDK_WINDOW_OFFSCREEN)
++    return;
++
+   base_precache_atoms (display);
+ 
+   if (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered") != NULL)
+--
+cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch b/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch
new file mode 100644
index 000000000000..91c51a65e04e
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch
@@ -0,0 +1,68 @@
+From 5d6ebcc17703e20560d55e34c8bef87d27ef0127 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@novell.com>
+Date: Fri, 21 May 2010 14:40:46 +0000
+Subject:     Implement action interface for gailcell.
+
+    Bug #580889.
+---
+diff --git a/modules/other/gail/gailbooleancell.c b/modules/other/gail/gailbooleancell.c
+index 5c86d04..0aefcfa 100644
+--- a/modules/other/gail/gailbooleancell.c
++++ b/modules/other/gail/gailbooleancell.c
+@@ -36,8 +36,7 @@ gchar *gail_boolean_cell_property_list[] = {
+   NULL
+ };
+ 
+-G_DEFINE_TYPE_WITH_CODE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_RENDERER_CELL,
+-                         gail_cell_type_add_action_interface (g_define_type_id))
++G_DEFINE_TYPE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_RENDERER_CELL)
+ 
+ static void 
+ gail_boolean_cell_class_init (GailBooleanCellClass *klass)
+diff --git a/modules/other/gail/gailcell.c b/modules/other/gail/gailcell.c
+index 35e531e..bc8dd13 100644
+--- a/modules/other/gail/gailcell.c
++++ b/modules/other/gail/gailcell.c
+@@ -37,7 +37,7 @@ static gint         gail_cell_get_index_in_parent (AtkObject           *obj);
+ 
+ /* AtkAction */
+ 
+-static void         gail_cell_atk_action_interface_init 
++static void         atk_action_interface_init 
+                                                   (AtkActionIface      *iface);
+ static ActionInfo * _gail_cell_get_action_info    (GailCell            *cell,
+ 			                           gint                index);
+@@ -76,6 +76,7 @@ static void         gail_cell_get_extents         (AtkComponent        *componen
+ static gboolean     gail_cell_grab_focus         (AtkComponent        *component);
+ 
+ G_DEFINE_TYPE_WITH_CODE (GailCell, gail_cell, ATK_TYPE_OBJECT,
++                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
+                          G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
+ 
+ static void	 
+@@ -285,7 +286,7 @@ gail_cell_get_index_in_parent (AtkObject *obj)
+ }
+ 
+ static void
+-gail_cell_atk_action_interface_init (AtkActionIface *iface)
++atk_action_interface_init (AtkActionIface *iface)
+ {
+   iface->get_n_actions = gail_cell_action_get_n_actions;
+   iface->do_action = gail_cell_action_do_action;
+@@ -298,14 +299,6 @@ gail_cell_atk_action_interface_init (AtkActionIface *iface)
+ void
+ gail_cell_type_add_action_interface (GType type)
+ {
+-  const GInterfaceInfo atk_action_info =
+-  {
+-    (GInterfaceInitFunc) gail_cell_atk_action_interface_init,
+-    (GInterfaceFinalizeFunc) NULL,
+-    NULL
+-  };
+-  g_type_add_interface_static (type, ATK_TYPE_ACTION,
+-                                 &atk_action_info);
+ }
+ 
+ gboolean
+--
+cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch b/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch
new file mode 100644
index 000000000000..50d7c5a6fca5
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch
@@ -0,0 +1,34 @@
+From 84f88bbb1d2e12b1c582e87fa098b823e91bbf33 Mon Sep 17 00:00:00 2001
+From: Jan Arne Petersen <jap@gnome.org>
+Date: Tue, 18 May 2010 06:46:42 +0000
+Subject: GtkRange: Redraw if GtkRange is a GtkScale and value is drawn.
+
+* gtk/gtkrange.c: (gtk_range_adjustment_value_change):
+Queue the draw also if the range is a scale and the value is drawn,
+fixing bug #533946 (Markus Brinkmann), when two HScales use one
+adjustment.
+---
+diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
+index 552eac7..a4fcee4 100644
+--- a/gtk/gtkrange.c
++++ b/gtk/gtkrange.c
+@@ -35,6 +35,7 @@
+ #include "gtkmarshalers.h"
+ #include "gtkorientable.h"
+ #include "gtkrange.h"
++#include "gtkscale.h"
+ #include "gtkscrollbar.h"
+ #include "gtkprivate.h"
+ #include "gtkintl.h"
+@@ -2618,7 +2619,8 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
+   gtk_range_calc_layout (range, range->adjustment->value);
+   
+   /* now check whether the layout changed  */
+-  if (layout_changed (range->layout, &layout))
++  if (layout_changed (range->layout, &layout) ||
++      (GTK_IS_SCALE (range) && GTK_SCALE (range)->draw_value))
+     {
+       gtk_widget_queue_draw (GTK_WIDGET (range));
+       /* setup a timer to ensure the range isn't lagging too much behind the scroll position */
+--
+cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch b/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch
new file mode 100644
index 000000000000..d2759b905d83
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch
@@ -0,0 +1,46 @@
+From a6c4833d9a307a1905516fb497dfaf0f141e1c0d Mon Sep 17 00:00:00 2001
+From: Javier Jardón <jjardon@gnome.org>
+Date: Tue, 04 May 2010 13:27:08 +0000
+Subject: Remove the definition of libpixbufloader_gdip_png_la_*
+
+libstatic-pixbufloader-gdip-png.la should not be built or at least not
+included in STATIC_GDIPLUS_LIBS as we don't want to use the GDI+-based
+loader for PNG, because if we do, we can't get (or was it set?) the
+options of a PNG pixbuf that for instance some code in GIMP wants to do.
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=607839
+---
+diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
+index cf1769b..52fd710 100644
+--- a/gdk-pixbuf/Makefile.am
++++ b/gdk-pixbuf/Makefile.am
+@@ -244,9 +244,6 @@ libstatic_pixbufloader_gdip_gif_la_SOURCES = 	\
+ libstatic_pixbufloader_gdip_jpeg_la_SOURCES = 	\
+ 	io-gdip-jpeg.c
+ 
+-libstatic_pixbufloader_gdip_png_la_SOURCES = 	\
+-	io-gdip-png.c
+-
+ libstatic_pixbufloader_gdip_tiff_la_SOURCES = 	\
+ 	io-gdip-tiff.c
+ 
+@@ -327,17 +324,6 @@ libpixbufloader_gdip_jpeg_la_SOURCES = 	\
+ 	io-gdip-jpeg.c
+ libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
+ 
+-libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined
+-libpixbufloader_gdip_png_la_SOURCES = 	\
+-	io-gdip-native.h		\
+-	io-gdip-propertytags.h		\
+-	io-gdip-utils.h			\
+-	io-gdip-utils.c			\
+-	io-gdip-animation.c		\
+-	io-gdip-animation.h		\
+-	io-gdip-png.c
+-libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32)
+-
+ libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined
+ libpixbufloader_gdip_tiff_la_SOURCES = 	\
+ 	io-gdip-native.h		\
+--
+cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch b/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch
new file mode 100644
index 000000000000..5c7332777d09
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch
@@ -0,0 +1,49 @@
+commit 006d5718fa927d9d3509fca1a1c1ca6522110b57
+Author: Matthias Clasen <mclasen@redhat.com>
+Date:   Wed May 12 15:02:02 2010 -0400
+
+    Another attempt to handle pngs changing int types
+
+diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
+index 43db70a..844064a 100644
+--- a/gdk-pixbuf/io-png.c
++++ b/gdk-pixbuf/io-png.c
+@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
+         gchar *icc_profile_base64;
+         const gchar *icc_profile_title;
+         const gchar *icc_profile;
+-        gulong icc_profile_size;
++        png_uint_32 icc_profile_size;
+         guint32 retval;
+         gint compression_type;
+ 
+@@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
+                                (png_charpp) &icc_profile_title, &compression_type,
+                                (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
+         if (retval != 0) {
+-                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
++                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
+                 gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64);
+                 g_free (icc_profile_base64);
+         }
+@@ -607,7 +607,7 @@ png_info_callback   (png_structp png_read_ptr,
+         gchar *icc_profile_base64;
+         const gchar *icc_profile_title;
+         const gchar *icc_profile;
+-        gulong icc_profile_size;
++        png_uint_32 icc_profile_size;
+         guint32 retval;
+         gint compression_type;
+ 
+@@ -679,9 +679,9 @@ png_info_callback   (png_structp png_read_ptr,
+         /* Extract embedded ICC profile */
+         retval = png_get_iCCP (png_read_ptr, png_info_ptr,
+                                (png_charpp) &icc_profile_title, &compression_type,
+-                               (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
++                               (png_charpp) &icc_profile, &icc_profile_size);
+         if (retval != 0) {
+-                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
++                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
+                 gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_profile_base64);
+                 g_free (icc_profile_base64);
+         }