Update to 2.6.7:

Overview of Changes from GTK+ 2.6.6 to GTK+ 2.6.7
=================================================
* Revert two fixes from 2.6.5 which were causing
  problems  [Crispin Flowerday]
* New and updated translations (bg,ja,ko,ca)

Overview of Changes from GTK+ 2.6.5 to GTK+ 2.6.6
=================================================
* Add 16x16 versions for some stock icons [Vincent Noel]
* Bug fixes [Tommi Komulainen, Roman Kagan, Ivan Wong,
  Matthias Clasen, Jakub Jelinek, Arjan van de Ven]
* New and improved translations (pl)

Overview of Changes from GTK+ 2.6.4 to GTK+ 2.6.5
=================================================
* Fix compilation with gcc 4.0 [Matthias Clasen]
* GtkFileChooser
  - Ellipsize the preview label [Jeroen Zwartepoorte]
  - The mime code can now use a mmapped cache [Matthias]
* GtkTreeView
  - Don't pop up the entry context menu if the
    the search entry is not visible  [Billy Biggs]
  - Make enable_search control only typeahead, not
    C-f search  [Sven Neumann]
  - Allow resetting search-column to -1 [Lorenzo Gil Sanchez]
  - Make gtk_tree_view_expand_all work [Tristan Van Berkom,
    Jonathan Blandford]
  - Make double-click to autosize work again [Matthias,
    Jonathan]
* GtkComboBox, GtkComboBoxEntry
  - Make gtk_widget_grab_focus() work [Gustavo Carneiro]
  - gtk_combo_box_get_active_text() now always returns
    the current text.  [Robert Staudinger]
* gdk-pixbuf
  - Use correct update regions when incrementally loading
    BMP and TGA images [Owen Taylor, David Costanzo]
  - Support saving BMPs [Ivan Wong]
  - Bug fixes [Tommi Komulainen, Morten Welinder, David,
    John Ellis]
* Other bug fixes [Christian Persch, Sven Neumann,
  Philip Langdale, Tomislav Jonjic, Thomas Leonard,
  Yury Puzis, Manish Singh, Doug Quale, Ryan Lortie,
  Kjartan Maraas, Morten, Felipe Heidrich, Paolo
  Borelli, Jorn Baayen, Hazael Maldonado Torres,
  Tommi, Stefan Kasal, Billy, Felipe Heidrich,
  Hans-Wolfgang Loidl, Jacob Kroon, Steven Walter]
* Documentation improvements [Johan Dahlin, Matthias,
  Jianfei Wang, Olivier Sessink, Jon-Kare Hellan, Kristof
  Vasant, Billy, Worik Stanton, Ken Siersma, Morten]
* New and improved translations (ca,cs,cy,da,de,en_CA,
  en_GB,es,fi,fr,gu,hu,it,lt,nl,pl,pt,pt_BR,ro,ru,rw,sq,
  sr,sr@Latn,sv,uk,zh_CN,zh_TW)

6 files changed, 18 insertions, 45 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 06cd7dc7d54..bd092039736 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.81 2005/04/15 13:47:25 wiz Exp $
 #
 
-DISTNAME=		gtk+-2.6.4
+DISTNAME=		gtk+-2.6.7
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 44e97856b35..24cb3f4d549 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.43 2005/04/01 10:51:50 salo Exp $
+$NetBSD: distinfo,v 1.44 2005/04/15 13:47:25 wiz Exp $
 
-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 (gtk+-2.6.7.tar.bz2) = 3a583ae6b468ded5dfcdc87cbd4f487d56b3e2c7
+RMD160 (gtk+-2.6.7.tar.bz2) = c664442d779f7fd1668a0294aa66d687f34601e4
+Size (gtk+-2.6.7.tar.bz2) = 11424614 bytes
+SHA1 (patch-aa) = 586ddbb1aa39a3ddaf92687df3952a71312ce3e8
+SHA1 (patch-ac) = d9a47653b8db5ffae28dc233aea0dc15399eea79
+SHA1 (patch-ad) = 1c93a494fa2040a1ec936cfd1fe31756b0fe3847
 SHA1 (patch-ae) = 1fdeeef405b2045f26335f0bb607e3c3d24b3ae6
 SHA1 (patch-af) = 6797fd34be0a34368f6edede2321562678b112ff
 SHA1 (patch-ag) = dc4d72a39e426b880ca69ba8bc499fdaf42e0da8
 SHA1 (patch-ah) = 486d6601d6dba04830a8645c6a5791755e6538d9
-SHA1 (patch-ai) = 190289e323da72e3c36555f3cb2e72bfc0be2ab1
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 30c5c926d2c..fcbb96bb954 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2005/03/02 15:39:06 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2005/04/15 13:47:25 wiz Exp $
 
---- gdk-pixbuf/Makefile.in.orig	2005-03-01 16:31:30.000000000 +0100
+--- gdk-pixbuf/Makefile.in.orig	2005-04-12 22:31:06.000000000 +0200
 +++ gdk-pixbuf/Makefile.in
-@@ -522,7 +522,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-
+@@ -528,7 +528,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 6a75bc4104a..b021b57b8f2 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.11 2005/03/02 15:39:06 wiz Exp $
+$NetBSD: patch-ac,v 1.12 2005/04/15 13:47:25 wiz Exp $
 
---- gdk/x11/gdkspawn-x11.c.orig	2004-08-09 22:14:43.000000000 +0200
+--- gdk/x11/gdkspawn-x11.c.orig	2005-03-16 04:25:09.000000000 +0100
 +++ gdk/x11/gdkspawn-x11.c
 @@ -28,6 +28,11 @@
- #include <glib.h>
  #include <gdk/gdk.h>
+ #include "gdkalias.h"
  
 +#if defined(__APPLE__)
 +#include <crt_externs.h>
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
index 0bb07445223..5db400da270 100644
--- a/x11/gtk2/patches/patch-ad
+++ b/x11/gtk2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.12 2005/03/02 15:39:06 wiz Exp $
+$NetBSD: patch-ad,v 1.13 2005/04/15 13:47:25 wiz Exp $
 
---- gtk/xdgmime/xdgmime.c.orig	2005-03-01 18:01:01.000000000 +0100
+--- gtk/xdgmime/xdgmime.c.orig	2005-04-03 05:56:50.000000000 +0200
 +++ gtk/xdgmime/xdgmime.c
-@@ -207,7 +207,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
+@@ -233,7 +233,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
  
    xdg_data_dirs = getenv ("XDG_DATA_DIRS");
    if (xdg_data_dirs == NULL)
diff --git a/x11/gtk2/patches/patch-ai b/x11/gtk2/patches/patch-ai
deleted file mode 100644
index 7c26b1d0afa..00000000000
--- a/x11/gtk2/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ai,v 1.7 2005/04/01 10:51:51 salo Exp $
-
---- gdk-pixbuf/io-bmp.c.orig	2005-01-04 16:47:02.000000000 +0100
-+++ gdk-pixbuf/io-bmp.c	2005-04-01 11:21:52.000000000 +0200
-@@ -219,7 +219,19 @@
- static gboolean grow_buffer (struct bmp_progressive_state *State,
-                              GError **error)
- {
--  guchar *tmp = g_try_realloc (State->buff, State->BufferSize);
-+  guchar *tmp;
-+
-+  if (State->BufferSize == 0) {
-+    g_set_error (error,
-+		 GDK_PIXBUF_ERROR,
-+		 GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-+		 _("BMP image has bogus header data"));
-+    State->read_state = READ_STATE_ERROR;
-+    return FALSE;
-+  }
-+
-+  tmp = g_try_realloc (State->buff, State->BufferSize);
-+
-   if (!tmp) {
-     g_set_error (error,
- 		 GDK_PIXBUF_ERROR,