Update gtk+ to 1.2.10. Overview of Changes in GTK+ 1.2.10:

* Fix focus drawing with no window manager
* Fix cut-and-paste with no current event
* Fix compilation using --with-xinput=gxi
* Fix problem with cut-and-paste and KOI8-R
* Fix rare problem with enter events and menus
* Fix problem with --with-native-locale and GNU libc-2.1
* Further fixes for using fonts, not fontsets, with non iso-8859-1.
* Fix problem with dropping onto internal children, such as CList buttons
* Translation updates

  This package also fixes a bug of gtk+-1.2.10 that messes up
focus-follows-pointer with embedded windows (which affects, for example,
the control center and various bonobo components in GNOME).  Thanks go to
Dan Winship <danw@ximian.com>, who provided this patch in private mail.

5 files changed, 39 insertions, 17 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 99c8137d744..66858d1bd81 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2001/03/27 03:20:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.54 2001/04/26 17:42:54 rh Exp $
 
-DISTNAME=		gtk+-1.2.9
+DISTNAME=		gtk+-1.2.10
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -11,7 +11,7 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gtk.org/
 COMMENT=		Gimp toolkit. Libraries for building X11 user interfaces
 
-DEPENDS+=		glib>=1.2.9:../../devel/glib
+DEPENDS+=		glib>=1.2.10:../../devel/glib
 BUILD_DEPENDS+=		perl-5.*:../../lang/perl5
 BUILD_USES_MSGFMT=	yes
 
diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo
index bebbe13303e..aa0e5bf7f60 100644
--- a/x11/gtk/distinfo
+++ b/x11/gtk/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 12:15:01 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/04/26 17:42:54 rh Exp $
 
-SHA1 (gtk+-1.2.9.tar.gz) = 06fc38a84bc4435fa0737675ca87f3aeab2e2e11
-SHA1 (patch-aa) = e5b2575b856d8ac27970a9023f0fe4bc593362ad
+SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c
+Size (gtk+-1.2.10.tar.gz) = 2868322 bytes
+SHA1 (patch-aa) = cbbc16d2086e948e438ae11f5377e169ff79407c
 SHA1 (patch-ab) = 17db6fd368e0bc63437f3f0a3d47ca9042cffea9
 SHA1 (patch-ac) = 4f7ffd7dbca81740e8b0304f96f7b3ce592404db
 SHA1 (patch-ad) = 7ea957fa92282e95b223821dc98d9d41ff45200e
+SHA1 (patch-ae) = 8ad654085ee8688d083e00b5f968dd732285ff9c
 SHA1 (patch-af) = d969891b6d8fa493294971894b5a355023c75460
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 600f8b8192c..505ea5b1fd8 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.21 2001/03/10 10:50:38 drochner Exp $
+$NetBSD: patch-aa,v 1.22 2001/04/26 17:42:55 rh Exp $
 
---- configure.orig	Fri Mar  2 20:34:37 2001
-+++ configure	Wed Mar  7 22:16:35 2001
+--- configure.orig	Wed Mar 28 23:11:45 2001
++++ configure
 @@ -22,8 +22,8 @@
  #
  GTK_MAJOR_VERSION=1
  GTK_MINOR_VERSION=2
--GTK_MICRO_VERSION=9
--GTK_INTERFACE_AGE=0
-+GTK_MICRO_VERSION=21
-+GTK_INTERFACE_AGE=9
- GTK_BINARY_AGE=9
+-GTK_MICRO_VERSION=10
+-GTK_INTERFACE_AGE=1
++GTK_MICRO_VERSION=22
++GTK_INTERFACE_AGE=10
+ GTK_BINARY_AGE=10
  GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
  ac_help="$ac_help
 @@ -4106,7 +4106,7 @@
diff --git a/x11/gtk/patches/patch-ae b/x11/gtk/patches/patch-ae
new file mode 100644
index 00000000000..769e0666abd
--- /dev/null
+++ b/x11/gtk/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.4 2001/04/26 17:42:55 rh Exp $
+
+--- gtk/gtkwindow.c.orig	Sat Mar 10 00:39:16 2001
++++ gtk/gtkwindow.c
+@@ -985,7 +985,13 @@
+       break;
+     case EnterNotify:
+     case LeaveNotify:
+-      if (xev->xcrossing.detail != NotifyInferior &&
++      /* We only track the actual destination of keyboard events for real
++       * toplevels, not for embedded toplevels such as GtkPlug. The reason for
++       * this is that GtkPlug redirects events so the widget may effectively not
++       * have the focus even if it actually has the focus.
++       */
++      if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () &&
++	  xev->xcrossing.detail != NotifyInferior &&
+ 	  xev->xcrossing.focus && !window->window_has_focus)
+ 	{
+ 	  window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE;
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 0d0c4c003f6..b1528eeb95d 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2001/03/10 10:50:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.31 2001/04/26 17:42:55 rh Exp $
 bin/gtk-config
 etc/gtk/gtkrc.az
 etc/gtk/gtkrc.be
@@ -173,12 +173,12 @@ include/gtk-1.2/gtk/gtksocket.h
 include/gtk-1.2/gtk/gtkthemes.h
 lib/libgdk.so
 lib/libgdk.so.12
-lib/libgdk.so.12.9
+lib/libgdk.so.12.10
 lib/libgdk.a
 lib/libgdk.la
 lib/libgtk.so
 lib/libgtk.so.12
-lib/libgtk.so.12.9
+lib/libgtk.so.12.10
 lib/libgtk.a
 lib/libgtk.la
 lib/pkgconfig/gdk.pc
@@ -234,6 +234,7 @@ ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk+.mo
 share/themes/Default/gtk/gtkrc
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk.m4 ${LOCALBASE}/share/aclocal/gtk.m4
 @unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gtk.m4