Update to 2.6.4:

Overview of Changes from GTK+ 2.6.3 to GTK+ 2.6.4
=================================================
* Move a lot of const data to the .rodata section [Matthias Clasen]
* Make caching of .icon files work again [Alexander Larsson]
* Fix many translations of our single Q_() message
  to not include the prefix [Christian Persch]

Overview of Changes from GTK+ 2.6.2 to GTK+ 2.6.3
=================================================
* GtkAction
 - Improve the handling of buttons as action
   proxys [Milosz Derezynski]
* gtk_window_present(): Use the timestamp of the last
  user interaction when focusing the window.  [Elijah Newren]
* Icon theme
 - Avoid scaling icons in the file chooser [Vincent Noel]
 - Make icon theme caching work on ppc64 [Manish Singh]
* Win32
 - Bug fixes [Tor Lillqvist]
 - Improve tablet handling [Robert Ögren]
* Other bug fixes [Rodney Dawes, Tommi Komulainen,
  Christian Persch, Manish Singh, Billy Biggs, Ben Maurer,
  Jorn Baayen, Jonathan Blandford, Murray Cumming,
  Olivier Sessink, Matthias, Gustavo Carneiro, Morten
  Welinder, Samuel Hym, Doug Morgan, Ivan Wong, Paul
  Cornett, Sven Neumann, Vincent Untz]
* Documentation improvements [Matthias, Torsten Schoenfeld]
* New and improved translations (ar,be,bg,ca,cy,el,en_GB,fa,gu,ja,hu,pt_BR,th,uk,xh)

10 files changed, 42 insertions, 38 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 28fe5b84ff7..fb7ae53c630 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2005/02/13 23:30:07 recht Exp $
+# $NetBSD: Makefile,v 1.77 2005/03/02 15:39:06 wiz Exp $
 #
 
-DISTNAME=		gtk+-2.6.2
+DISTNAME=		gtk+-2.6.4
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 3d29e797a66..16a9d2c6a22 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2005/02/04 21:40:33 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.39 2005/03/02 15:39:06 wiz Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@@ -303,6 +303,7 @@ share/doc/gdk-pixbuf/license.html
 share/doc/gdk-pixbuf/right.png
 share/doc/gdk-pixbuf/rn01.html
 share/doc/gdk-pixbuf/rn02.html
+share/doc/gdk-pixbuf/style.css
 share/doc/gdk-pixbuf/up.png
 share/doc/gdk/GdkDisplay.html
 share/doc/gdk/GdkDisplayManager.html
@@ -409,6 +410,7 @@ share/doc/gdk/sizing.png
 share/doc/gdk/spider.png
 share/doc/gdk/spraycan.png
 share/doc/gdk/star.png
+share/doc/gdk/style.css
 share/doc/gdk/target.png
 share/doc/gdk/tcross.png
 share/doc/gdk/top_left_arrow.png
@@ -974,6 +976,8 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk20-properties.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtk20-properties.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gtk20-properties.mo
 ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index f24c274989c..198ad0052f6 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.41 2005/02/23 17:36:11 wiz Exp $
+$NetBSD: distinfo,v 1.42 2005/03/02 15:39:06 wiz Exp $
 
-SHA1 (gtk+-2.6.2.tar.bz2) = 5c7d5e1bd05cd934718c72de4a4bc148a7005634
-RMD160 (gtk+-2.6.2.tar.bz2) = 2c76305f676ab226fd99e4572bc56e5a3a43fbcf
-Size (gtk+-2.6.2.tar.bz2) = 11206837 bytes
-SHA1 (patch-aa) = ab8a71ffa3b44816bb6f53ced068f80132b67c09
-SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
-SHA1 (patch-ad) = dad88a4ee8bdac6bd3ea32b16ce4e0a3d1b202ab
-SHA1 (patch-ae) = 04dbb379cea2bc1ca2e26893abddd3679f8476b3
-SHA1 (patch-af) = 0fa3e8958023d0e6bce456f89178c1cfdb551ff3
-SHA1 (patch-ag) = 5bccfda9bda71aefe70993b59fa5a466349a165e
-SHA1 (patch-ah) = 966f8a6cd3057c32c8fce937456b06efff9d27cd
+SHA1 (gtk+-2.6.4.tar.bz2) = d4f91ae7e1b2b2be24821789d68057d21f4a9911
+RMD160 (gtk+-2.6.4.tar.bz2) = 351e9752f46e68e3839f79d3b8c155d320d27bb9
+Size (gtk+-2.6.4.tar.bz2) = 11222426 bytes
+SHA1 (patch-aa) = 4fafe04ba57ab394aa4a462369ff235d3976948b
+SHA1 (patch-ac) = a1165e3494c44b04243152a8f47d4a19494994a2
+SHA1 (patch-ad) = 2b87a113ea6852f47095880e0ee72ab7d55c69a2
+SHA1 (patch-ae) = 1fdeeef405b2045f26335f0bb607e3c3d24b3ae6
+SHA1 (patch-af) = 6797fd34be0a34368f6edede2321562678b112ff
+SHA1 (patch-ag) = dc4d72a39e426b880ca69ba8bc499fdaf42e0da8
+SHA1 (patch-ah) = 486d6601d6dba04830a8645c6a5791755e6538d9
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index a708d2e0bf2..30c5c926d2c 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2004/12/04 22:19:18 jmmv Exp $
+$NetBSD: patch-aa,v 1.12 2005/03/02 15:39:06 wiz Exp $
 
---- gdk-pixbuf/Makefile.in.orig	2004-12-04 22:58:57.000000000 +0100
+--- gdk-pixbuf/Makefile.in.orig	2005-03-01 16:31:30.000000000 +0100
 +++ gdk-pixbuf/Makefile.in
-@@ -516,7 +516,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-
+@@ -522,7 +522,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-
  gdk_pixbuf_csource_LDADD = $(LDADDS)
  
  gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index 2f9dcba83ba..6a75bc4104a 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2004/04/24 22:08:55 danw Exp $
+$NetBSD: patch-ac,v 1.11 2005/03/02 15:39:06 wiz Exp $
 
---- gdk/x11/gdkspawn-x11.c.orig	Mon Apr 12 23:01:39 2004
+--- gdk/x11/gdkspawn-x11.c.orig	2004-08-09 22:14:43.000000000 +0200
 +++ gdk/x11/gdkspawn-x11.c
-@@ -27,6 +27,11 @@
+@@ -28,6 +28,11 @@
  #include <glib.h>
  #include <gdk/gdk.h>
  
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
index 34045852b93..0bb07445223 100644
--- a/x11/gtk2/patches/patch-ad
+++ b/x11/gtk2/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.11 2005/01/12 11:20:20 jmmv Exp $
+$NetBSD: patch-ad,v 1.12 2005/03/02 15:39:06 wiz Exp $
 
---- gtk/xdgmime/xdgmime.c.orig	2004-12-09 18:26:52.000000000 +0100
+--- gtk/xdgmime/xdgmime.c.orig	2005-03-01 18:01:01.000000000 +0100
 +++ gtk/xdgmime/xdgmime.c
 @@ -207,7 +207,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
  
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index 5b12e66ea4b..50206364f92 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.8 2005/01/18 12:06:37 jmmv Exp $
+$NetBSD: patch-ae,v 1.9 2005/03/02 15:39:06 wiz Exp $
 
---- gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S.orig	2004-08-11 16:23:31.000000000 +0200
+--- gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S.orig	2005-02-28 19:08:34.000000000 +0100
 +++ gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S
 @@ -4,7 +4,7 @@ gcc2_compiled.:
  .text
@@ -9,5 +9,5 @@ $NetBSD: patch-ae,v 1.8 2005/01/18 12:06:37 jmmv Exp $
 -#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
 +#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
  	
- .globl _pixops_composite_line_22_4a4_mmx
- 	.type	 _pixops_composite_line_22_4a4_mmx,@function
+ /* Magic indicating no need for an executable stack */
+ #if !defined __powerpc64__ && !defined __ia64__
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index 124f9c970fe..d207747ae67 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.10 2005/01/18 12:06:37 jmmv Exp $
+$NetBSD: patch-af,v 1.11 2005/03/02 15:39:06 wiz Exp $
 
---- gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S.orig	2004-08-11 16:23:31.000000000 +0200
+--- gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S.orig	2005-02-28 19:08:34.000000000 +0100
 +++ gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S
 @@ -4,7 +4,7 @@ gcc2_compiled.:
  .text
@@ -9,5 +9,5 @@ $NetBSD: patch-af,v 1.10 2005/01/18 12:06:37 jmmv Exp $
 -#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
 +#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
  
- .globl _pixops_composite_line_color_22_4a4_mmx
- 	.type	 _pixops_composite_line_color_22_4a4_mmx,@function
+ /* Magic indicating no need for an executable stack */
+ #if !defined __powerpc64__ && !defined __ia64__
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
index a9fb324191f..bd292d79e13 100644
--- a/x11/gtk2/patches/patch-ag
+++ b/x11/gtk2/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.6 2005/01/18 12:06:38 jmmv Exp $
+$NetBSD: patch-ag,v 1.7 2005/03/02 15:39:06 wiz Exp $
 
---- gdk-pixbuf/pixops/have_mmx.S.orig	2004-08-11 16:23:31.000000000 +0200
+--- gdk-pixbuf/pixops/have_mmx.S.orig	2005-02-28 19:08:34.000000000 +0100
 +++ gdk-pixbuf/pixops/have_mmx.S
 @@ -4,7 +4,7 @@ gcc2_compiled.:
  .text
@@ -9,5 +9,5 @@ $NetBSD: patch-ag,v 1.6 2005/01/18 12:06:38 jmmv Exp $
 -#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
 +#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
  
- .globl _pixops_have_mmx
- 	.type	 _pixops_have_mmx,@function
+ /* Magic indicating no need for an executable stack */
+ #if !defined __powerpc64__ && !defined __ia64__
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
index 7e356ca7628..a201e6545dc 100644
--- a/x11/gtk2/patches/patch-ah
+++ b/x11/gtk2/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.8 2005/01/18 12:06:38 jmmv Exp $
+$NetBSD: patch-ah,v 1.9 2005/03/02 15:39:06 wiz Exp $
 
---- gdk-pixbuf/pixops/scale_line_22_33_mmx.S.orig	2004-08-11 16:23:31.000000000 +0200
+--- gdk-pixbuf/pixops/scale_line_22_33_mmx.S.orig	2005-02-28 19:08:34.000000000 +0100
 +++ gdk-pixbuf/pixops/scale_line_22_33_mmx.S
 @@ -4,7 +4,7 @@ gcc2_compiled.:
  .text
@@ -9,5 +9,5 @@ $NetBSD: patch-ah,v 1.8 2005/01/18 12:06:38 jmmv Exp $
 -#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
 +#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
  	
- .globl _pixops_scale_line_22_33_mmx
- 	.type	 _pixops_scale_line_22_33_mmx,@function
+ /* Magic indicating no need for an executable stack */
+ #if !defined __powerpc64__ && !defined __ia64__