Update to 2.6.1:

* GtkFileChooser
 - Fix some possible threading deadlocks [Matthias Clasen]
 - Don't return errors from the private GTK_FILE_SYSTEM_ERROR
   domain [Murray Cumming]
 - Fix some crashes with unreadable directories [Federico Mena
   Quintero]
 - Add an "Open Location" item to the context menu [Federico]
* GtkTreeView
 - Make sorting work again in list stores [Marcin Krzyzanowski]
 - Restrict column reordering to button 1 [Jonathan Blandford]
* GtkComboBox
 - Make the button prelight [Ricardo Veguilla]
 - Fix state propagation [Carlos Garnacho Parro]
* GtkMessageDialog
 - Don't show secondary label until it is set [Christian Persch]
* GtkMenu
 - Make items activate immediately on button release [Søren Sandmann]
 - Submenus inherit their cascading direction [Matthias]
* gdk-pixbuf
 - Fix a possible threading deadlock when loading
   animations [Callum McKenzie]
 - Make Hyper interpolation work again [Dennis Nezic]
* Win32
  - Improve handling of UNC paths [Tor Lillqvist]
  - Show the correct Desktop folder in the file chooser [Tor]
  - Bug fixes [Tor]
* Bug fixes [Torsten Schoenfeld, Morten Welinder,
  Marcin, Seth Nickell, Jonathan, Owen Taylor, Søren,
  Iñigo Serna, John Finlay, Zeeshan Ali, Robert Ögren,
  Billy Biggs, Brian Tarricone, Tor, Christian, Tristan
  Van Berkom, Elijah Newren, Federico, James M. Cape,
  Matthias, Arnaud Charlet]
* Documentation improvements [Masao Mutoh, Torsten,
  Billy, Alessio Dessi, David Bourguignon, Tommi Komulainen,
  Dave Bordoley, Robert Ancell, Kentaro Fukuchi, Matthias,
  Christian Biere, Jonathan, Tommi, Stefan Kost]
* New and improved translations (cs,cy,da,de,en_CA,es,ja,lt,nl,sq,sv,zh_CN)

5 files changed, 34 insertions, 47 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index c28882da0c1..774f92e1b85 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2005/01/04 23:52:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.72 2005/01/09 17:30:46 jmmv Exp $
 #
 
-DISTNAME=		gtk+-2.6.0
+DISTNAME=		gtk+-2.6.1
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \
@@ -18,7 +17,7 @@ CONFLICTS=		gtk2-engines<2.6.0
 
 BUILD_USES_MSGFMT=	yes
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.1
 BUILDLINK_DEPENDS.pango+=	pango>=1.8.0
 BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2nb2
 
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index cb0baa47f20..2bf14185ce2 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2004/12/24 10:04:39 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.37 2005/01/09 17:30:47 jmmv Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@@ -735,6 +735,7 @@ share/doc/gtk/stock_media_forward_24.png
 share/doc/gtk/stock_media_next_24.png
 share/doc/gtk/stock_media_pause_24.png
 share/doc/gtk/stock_media_play_24.png
+share/doc/gtk/stock_media_play_rtl_24.png
 share/doc/gtk/stock_media_previous_24.png
 share/doc/gtk/stock_media_record_24.png
 share/doc/gtk/stock_media_rewind_24.png
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 9d21964c083..fdff5d445a4 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.36 2005/01/04 23:52:16 jmmv Exp $
+$NetBSD: distinfo,v 1.37 2005/01/09 17:30:47 jmmv Exp $
 
-SHA1 (gtk+-2.6.0.tar.bz2) = 2f98456c135aacc89d82d47e2b257cb917bcd31f
-Size (gtk+-2.6.0.tar.bz2) = 10924415 bytes
+SHA1 (gtk+-2.6.1.tar.bz2) = a584abc1d43e68dc79ebfb9e5d09bd9aa1a77781
+Size (gtk+-2.6.1.tar.bz2) = 11070668 bytes
 SHA1 (patch-aa) = ab8a71ffa3b44816bb6f53ced068f80132b67c09
-SHA1 (patch-ab) = 9a9d10c91160886f48b80367297216f1217c2a44
+SHA1 (patch-ab) = 764729f9ee7e8b66e7165c34da0863b033af9552
 SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
-SHA1 (patch-ad) = 95eaa8383c54d434070c1629bf41aa501c377c87
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
index 38aaebec7f6..e6631daeb2e 100644
--- a/x11/gtk2/patches/patch-ab
+++ b/x11/gtk2/patches/patch-ab
@@ -1,13 +1,32 @@
-$NetBSD: patch-ab,v 1.9 2004/12/24 10:04:39 jmmv Exp $
+$NetBSD: patch-ab,v 1.10 2005/01/09 17:30:47 jmmv Exp $
 
---- gtk/gtkicontheme.c.orig	2004-12-12 22:09:13.000000000 +0100
+--- gtk/gtkicontheme.c.orig	2005-01-03 15:44:33.000000000 +0100
 +++ gtk/gtkicontheme.c
-@@ -578,7 +578,7 @@ gtk_icon_theme_init (GtkIconTheme *icon_
-   for (j = 0; xdg_data_dirs[j]; j++) 
-     priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "icons", NULL);
+@@ -568,10 +568,7 @@ gtk_icon_theme_init (GtkIconTheme *icon_
+   xdg_data_dirs = g_get_system_data_dirs ();
+   for (i = 0; xdg_data_dirs[i]; i++) ;
  
+-  priv->search_path_len = i + 2;
+-#ifdef G_OS_UNIX
+-  priv->search_path_len++;
+-#endif
++  priv->search_path_len = i * 2 + 2;
+   
+   priv->search_path = g_new (char *, priv->search_path_len);
+   
+@@ -579,12 +576,10 @@ gtk_icon_theme_init (GtkIconTheme *icon_
+   priv->search_path[i++] = g_build_filename (g_get_home_dir (), ".icons", NULL);
+   priv->search_path[i++] = g_build_filename (g_get_user_data_dir (), "icons", NULL);
+   
+-  for (j = 0; xdg_data_dirs[j]; j++) 
++  for (j = 0; xdg_data_dirs[j]; j++) {
+     priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "icons", NULL);
+-
+-#ifdef G_OS_UNIX
 -  priv->search_path[i++] = g_strdup ("/usr/share/pixmaps");
-+  priv->search_path[i++] = g_strdup (GTK_DATADIR "/pixmaps");
+-#endif
++    priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "pixmaps", NULL);
++  }
  
    priv->themes_valid = FALSE;
    priv->themes = NULL;
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
deleted file mode 100644
index fdc961e0440..00000000000
--- a/x11/gtk2/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2005/01/04 23:52:16 jmmv Exp $
-
---- gdk-pixbuf/gdk-pixbuf-animation.c.orig	2004-12-05 13:43:47.000000000 +0100
-+++ gdk-pixbuf/gdk-pixbuf-animation.c
-@@ -139,7 +139,7 @@ gdk_pixbuf_animation_new_from_file (cons
- 	guchar buffer [128];
- 	GdkPixbufModule *image_module;
-         gchar *display_name;
--        gboolean locked;
-+        gboolean locked = FALSE;
- 
- 	g_return_val_if_fail (filename != NULL, NULL);
-         g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-@@ -184,8 +184,6 @@ gdk_pixbuf_animation_new_from_file (cons
-                         return NULL;
-                 }
- 
--        locked = _gdk_pixbuf_lock (image_module);
--
- 	if (image_module->load_animation == NULL) {
- 		GdkPixbuf *pixbuf;
- 
-@@ -221,6 +219,8 @@ gdk_pixbuf_animation_new_from_file (cons
- 
-                 g_object_unref (pixbuf);
- 	} else {
-+		locked = _gdk_pixbuf_lock (image_module);
-+
- 		fseek (f, 0, SEEK_SET);
- 		animation = (* image_module->load_animation) (f, error);
-