4 files changed, 11 insertions, 42 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 2176db7da73..e81e1db2239 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.145 2007/09/18 10:44:56 wiz Exp $
+# $NetBSD: Makefile,v 1.146 2007/10/27 12:17:06 wiz Exp $
 
-DISTNAME=		gtk+-2.12.0
+DISTNAME=		gtk+-2.12.1
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.12/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.12/ \
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 86e205a2a8e..d6f8ff45a1d 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.54 2007/09/16 19:53:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.55 2007/10/27 12:17:08 wiz Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-builder-convert
@@ -962,6 +962,8 @@ share/locale/ang/LC_MESSAGES/gtk20-properties.mo
 share/locale/ang/LC_MESSAGES/gtk20.mo
 share/locale/ar/LC_MESSAGES/gtk20-properties.mo
 share/locale/ar/LC_MESSAGES/gtk20.mo
+share/locale/as/LC_MESSAGES/gtk20-properties.mo
+share/locale/as/LC_MESSAGES/gtk20.mo
 share/locale/az/LC_MESSAGES/gtk20-properties.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo
@@ -1032,6 +1034,8 @@ share/locale/ia/LC_MESSAGES/gtk20-properties.mo
 share/locale/ia/LC_MESSAGES/gtk20.mo
 share/locale/id/LC_MESSAGES/gtk20-properties.mo
 share/locale/id/LC_MESSAGES/gtk20.mo
+share/locale/io/LC_MESSAGES/gtk20-properties.mo
+share/locale/io/LC_MESSAGES/gtk20.mo
 share/locale/is/LC_MESSAGES/gtk20-properties.mo
 share/locale/is/LC_MESSAGES/gtk20.mo
 share/locale/it/LC_MESSAGES/gtk20-properties.mo
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 4cbf3e5feef..17938cee759 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.91 2007/10/21 02:03:34 obache Exp $
+$NetBSD: distinfo,v 1.92 2007/10/27 12:17:08 wiz Exp $
 
-SHA1 (gtk+-2.12.0.tar.bz2) = f5ecbf73a789a8880a6b2e15279267bb113980e2
-RMD160 (gtk+-2.12.0.tar.bz2) = 226c8f38eb7895d63f81feb60152db1ca3599628
-Size (gtk+-2.12.0.tar.bz2) = 15732170 bytes
+SHA1 (gtk+-2.12.1.tar.bz2) = 80114570273608251ef5acf9ee3daa4a3eb3d56b
+RMD160 (gtk+-2.12.1.tar.bz2) = 3c3facd971a20178060c7e7cfe9d4cefd651250b
+Size (gtk+-2.12.1.tar.bz2) = 15856678 bytes
 SHA1 (patch-aa) = 507f43c8257607c3ddb194015cc67c5b166a5047
-SHA1 (patch-ab) = f3c18aae126b4c7cb240b31af8ddf41226266a79
 SHA1 (patch-ad) = f38270c343961be2892d8f2b2f89a67d21f0dc15
 SHA1 (patch-ai) = a71559e7f06a0334f19e3d44288dae5fcecff131
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
deleted file mode 100644
index acec918d41f..00000000000
--- a/x11/gtk2/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.18 2007/09/18 10:44:57 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=476342
-
-From upstream SVN:
-   Revision 18823 - (view) (annotate) - [select for diffs]
-   Modified Fri Sep 14 02:11:01 2007 UTC (4 days, 6 hours ago) by matthiasc
-   File length: 13336 byte(s)
-   Diff to previous 17898
-
- Turn off icon cache validation by default
-
---- gtk/gtkiconcache.c.orig	2007-09-13 20:35:41.000000000 +0000
-+++ gtk/gtkiconcache.c
-@@ -127,6 +127,9 @@ _gtk_icon_cache_new_for_path (const gcha
-   info.n_directories = 0;
-   info.flags = CHECK_OFFSETS|CHECK_STRINGS;
- 
-+#ifdef G_ENABLE_DEBUG
-+  if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
-+    {
-   if (!_gtk_icon_cache_validate (&info))
-     {
-       g_mapped_file_free (map);
-@@ -134,6 +137,8 @@ _gtk_icon_cache_new_for_path (const gcha
- 
-       goto done;
-     }
-+    }
-+#endif
-   
-   GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
-