bugfix bump for #22576 with added patch

4 files changed, 77 insertions, 5 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index bb5c87bad885..39fc6ccc72ad 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,12 +1,10 @@
 MD5 01148935388230826d6a072e9841a8ef gtk+-2.2.1.ebuild 2355
 MD5 d639c96d2bb6007573dba36985e67e45 gtk+-1.2.10-r10.ebuild 1869
 MD5 63b66999c16c73d9fcdc4104d1022da2 gtk+-1.2.10-r9.ebuild 1769
-MD5 2e9e6d4d8a15ec48001920cb0e336932 gtk+-2.2.2-r1.ebuild 2859
-MD5 c6210cb6a81f0381391fde9b3cea197c ChangeLog 11561
-MD5 2bfa46bdf460e9bef9614a4f520e3485 gtk+-2.2.2.ebuild 2770
+MD5 34f33b7b414805edd98dc28423af6598 gtk+-2.2.2-r1.ebuild 2860
+MD5 a173ec97d178525f1fa0298464387b2b ChangeLog 11710
 MD5 87f991351775a855c2cc3fdabc38f541 gtk+-2.2.1-r1.ebuild 2472
 MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1 64
-MD5 eb031c47250137c58587c61124e7abf9 files/digest-gtk+-2.2.2 64
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.2 b/x11-libs/gtk+/files/digest-gtk+-2.2.2-r1
index 1c2912f96d68..1c2912f96d68 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.2.2
+++ b/x11-libs/gtk+/files/digest-gtk+-2.2.2-r1
diff --git a/x11-libs/gtk+/files/gtk+-2.2.2-revert_gtkwidget.patch b/x11-libs/gtk+/files/gtk+-2.2.2-revert_gtkwidget.patch
new file mode 100644
index 000000000000..653502656fc2
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.2.2-revert_gtkwidget.patch
@@ -0,0 +1,72 @@
+--- gtk+-2.2.2/gtk/gtkwidget.c	2003-06-09 03:54:48.000000000 +0200
++++ gtk+-2.2.1/gtk/gtkwidget.c	2002-12-19 00:45:51.000000000 +0100
+@@ -463,7 +463,7 @@
+  							 FALSE,
+  							 G_PARAM_READWRITE));
+   g_object_class_install_property (gobject_class,
+-				   PROP_IS_FOCUS,
++				   PROP_HAS_FOCUS,
+ 				   g_param_spec_boolean ("is_focus",
+  							 _("Is focus"),
+  							 _("Whether the widget is the focus widget within the toplevel"),
+@@ -3038,60 +3038,12 @@
+   return gtk_widget_event_internal (widget, event);
+ }
+ 
+-static gboolean
+-event_window_is_still_viewable (GdkEvent *event)
+-{
+-  /* Check that we think the event's window is viewable before
+-   * delivering the event, to prevent suprises. We do this here
+-   * at the last moment, since the event may have been queued
+-   * up behind other events, held over a recursive main loop, etc.
+-   */
+-  switch (event->type)
+-    {
+-    case GDK_EXPOSE:
+-    case GDK_MOTION_NOTIFY:
+-    case GDK_BUTTON_PRESS:
+-    case GDK_2BUTTON_PRESS:
+-    case GDK_3BUTTON_PRESS:
+-    case GDK_KEY_PRESS:
+-    case GDK_ENTER_NOTIFY:
+-    case GDK_PROXIMITY_IN:
+-    case GDK_SCROLL:
+-      return event->any.window && gdk_window_is_viewable (event->any.window);
+-
+-#if 0
+-    /* The following events are the second half of paired events;
+-     * we always deliver them to deal with widgets that clean up
+-     * on the second half.
+-     */
+-    case GDK_BUTTON_RELEASE:
+-    case GDK_KEY_RELEASE:
+-    case GDK_LEAVE_NOTIFY:
+-    case GDK_PROXIMITY_OUT:
+-#endif      
+-      
+-    default:
+-      /* Remaining events would make sense on an not-viewable window,
+-       * or don't have an associated window.
+-       */
+-      return TRUE;
+-    }
+-}
+-
+ static gint
+ gtk_widget_event_internal (GtkWidget *widget,
+ 			   GdkEvent  *event)
+ {
+   gboolean return_val = FALSE;
+ 
+-  /* We check only once for is-still-visible; if someone
+-   * hides the window in on of the signals on the widget,
+-   * they are responsible for returning TRUE to terminate
+-   * handling.
+-   */
+-  if (!event_window_is_still_viewable (event))
+-    return TRUE;
+-
+   g_object_ref (widget);
+ 
+   g_signal_emit (widget, widget_signals[EVENT], 0, event, &return_val);
diff --git a/x11-libs/gtk+/gtk+-2.2.2.ebuild b/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild
index 361251bc1d59..1586a73ebe0a 100644
--- a/x11-libs/gtk+/gtk+-2.2.2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.2.ebuild,v 1.2 2003/06/10 15:19:27 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild,v 1.1 2003/06/12 11:26:07 foser Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -40,6 +40,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# xft/slighthint stuff from RH
 	cd ${S}; epatch ${FILESDIR}/${PN}-2-xftprefs.patch
+	# 'fix' for problem described in #22576
+	epatch ${FILESDIR}/${P}-revert_gtkwidget.patch
 
 	autoconf || die
 }