Fix busted stock icons (PR pkg/44119). Patch borrowed from OpenBSD.

Upstream bug report:
  https://bugzilla.gnome.org/show_bug.cgi?id=629878

While here, update to gtk2+-2.22.1 (bug fixes and translation updates)

4 files changed, 283 insertions, 8 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 459a57389bc..50b59109e89 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.208 2010/11/15 22:59:00 abs Exp $
+# $NetBSD: Makefile,v 1.209 2010/11/23 13:31:33 tnn Exp $
 
-DISTNAME=		gtk+-2.22.0
+DISTNAME=		gtk+-2.22.1
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.22/ \
 			${MASTER_SITE_GNOME:=sources/gtk+/2.22/}
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index d9c8d2846a6..77d79ff10be 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.73 2010/11/15 18:28:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.74 2010/11/23 13:31:33 tnn Exp $
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
@@ -1064,6 +1064,8 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ka/LC_MESSAGES/gtk20-properties.mo
 share/locale/ka/LC_MESSAGES/gtk20.mo
+share/locale/kg/LC_MESSAGES/gtk20-properties.mo
+share/locale/kg/LC_MESSAGES/gtk20.mo
 share/locale/kk/LC_MESSAGES/gtk20-properties.mo
 share/locale/kk/LC_MESSAGES/gtk20.mo
 share/locale/kn/LC_MESSAGES/gtk20-properties.mo
@@ -1072,6 +1074,8 @@ share/locale/ko/LC_MESSAGES/gtk20-properties.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/ku/LC_MESSAGES/gtk20-properties.mo
 share/locale/ku/LC_MESSAGES/gtk20.mo
+share/locale/lg/LC_MESSAGES/gtk20-properties.mo
+share/locale/lg/LC_MESSAGES/gtk20.mo
 share/locale/li/LC_MESSAGES/gtk20-properties.mo
 share/locale/li/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20-properties.mo
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 8439aef4257..a7464e747a6 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.130 2010/11/15 18:28:45 drochner Exp $
+$NetBSD: distinfo,v 1.131 2010/11/23 13:31:33 tnn Exp $
 
-SHA1 (gtk+-2.22.0.tar.bz2) = 3af12d8eb3520516b25fa82873f87473dfb42cc0
-RMD160 (gtk+-2.22.0.tar.bz2) = 50da72c8f1f7416e79ffbd458252e65fe7ba96af
-Size (gtk+-2.22.0.tar.bz2) = 18146592 bytes
+SHA1 (gtk+-2.22.1.tar.bz2) = c88d8be4aebd6e59d6ca44d57f6acd18e2be1c08
+RMD160 (gtk+-2.22.1.tar.bz2) = f7d5cd312dc982a599e6a834c87c1bc07ff87e2d
+Size (gtk+-2.22.1.tar.bz2) = 18306164 bytes
+SHA1 (patch-aa) = 57c8f35646237495a4916fba49fb2d002dfd77c1
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = 9e3009396f2377ece4dba1f79d6f65c3478ec81f
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
new file mode 100644
index 00000000000..398d2093131
--- /dev/null
+++ b/x11/gtk2/patches/patch-aa
@@ -0,0 +1,271 @@
+$NetBSD: patch-aa,v 1.19 2010/11/23 13:31:34 tnn Exp $
+
+Fix busted stock icons (PR pkg/44119). Patch borrowed from OpenBSD.
+ 
+Upstream bug report:
+  https://bugzilla.gnome.org/show_bug.cgi?id=629878
+
+--- gtk/Makefile.in.orig	2010-09-23 14:27:23.000000000 +0000
++++ gtk/Makefile.in
+@@ -1598,7 +1598,171 @@ GENERATED_ICONS = \
+ 	stock-icons/24/folder-remote.png 		\
+ 	stock-icons/24/user-home.png 			\
+ 	stock-icons/24/user-desktop.png 		\
+-	stock-icons/24/text-x-generic.png
++	stock-icons/24/text-x-generic.png		\
++	stock-icons/16/gtk-quit.png			\
++	stock-icons/16/gtk-info.png			\
++	stock-icons/16/gtk-file.png			\
++	stock-icons/16/gtk-open.png			\
++	stock-icons/16/gtk-print-preview.png		\
++	stock-icons/16/gtk-print.png			\
++	stock-icons/16/gtk-properties.png		\
++	stock-icons/16/gtk-revert-to-saved-ltr.png	\
++	stock-icons/16/gtk-revert-to-saved-rtl.png	\
++	stock-icons/16/gtk-save-as.png			\
++	stock-icons/16/gtk-new.png			\
++	stock-icons/16/gtk-harddisk.png			\
++	stock-icons/16/gtk-clear.png			\
++	stock-icons/16/gtk-copy.png			\
++	stock-icons/16/gtk-cut.png			\
++	stock-icons/16/gtk-delete.png			\
++	stock-icons/16/gtk-find-and-replace.png		\
++	stock-icons/16/gtk-find.png			\
++	stock-icons/16/gtk-paste.png			\
++	stock-icons/16/gtk-redo-ltr.png			\
++	stock-icons/16/gtk-redo-rtl.png			\
++	stock-icons/16/gtk-select-all.png		\
++	stock-icons/16/gtk-undo-ltr.png			\
++	stock-icons/16/gtk-undo-rtl.png			\
++	stock-icons/16/gtk-directory.png		\
++	stock-icons/16/gtk-unindent-ltr.png		\
++	stock-icons/16/gtk-unindent-rtl.png		\
++	stock-icons/16/gtk-indent-ltr.png		\
++	stock-icons/16/gtk-indent-rtl.png		\
++	stock-icons/16/gtk-justify-center.png		\
++	stock-icons/16/gtk-justify-fill.png		\
++	stock-icons/16/gtk-justify-left.png		\
++	stock-icons/16/gtk-justify-right.png		\
++	stock-icons/16/gtk-bold.png			\
++	stock-icons/16/gtk-italic.png			\
++	stock-icons/16/gtk-strikethrough.png		\
++	stock-icons/16/gtk-underline.png		\
++	stock-icons/16/gtk-goto-bottom.png		\
++	stock-icons/16/gtk-go-down.png			\
++	stock-icons/16/gtk-goto-first-ltr.png		\
++	stock-icons/16/gtk-home.png			\
++	stock-icons/16/gtk-jump-to-ltr.png		\
++	stock-icons/16/gtk-jump-to-rtl.png		\
++	stock-icons/16/gtk-goto-last-ltr.png		\
++	stock-icons/16/gtk-go-forward-ltr.png		\
++	stock-icons/16/gtk-go-back-ltr.png		\
++	stock-icons/16/gtk-goto-top.png			\
++	stock-icons/16/gtk-go-up.png			\
++	stock-icons/16/gtk-about.png			\
++	stock-icons/16/gtk-help.png			\
++	stock-icons/16/gtk-missing-image.png		\
++	stock-icons/16/gtk-add.png			\
++	stock-icons/16/gtk-remove.png			\
++	stock-icons/16/gtk-floppy.png			\
++	stock-icons/16/gtk-cdrom.png			\
++	stock-icons/16/gtk-media-pause.png		\
++	stock-icons/16/gtk-media-play-ltr.png		\
++	stock-icons/16/gtk-media-play-rtl.png		\
++	stock-icons/16/gtk-media-stop.png		\
++	stock-icons/16/gtk-media-record.png		\
++	stock-icons/16/gtk-media-rewind-ltr.png		\
++	stock-icons/16/gtk-media-forward-ltr.png	\
++	stock-icons/16/gtk-media-previous-ltr.png	\
++	stock-icons/16/gtk-media-next-ltr.png		\
++	stock-icons/16/gtk-network.png			\
++	stock-icons/16/gtk-print-error.png		\
++	stock-icons/16/gtk-print-report.png		\
++	stock-icons/16/gtk-print-paused.png		\
++	stock-icons/16/gtk-print-warning.png		\
++	stock-icons/16/gtk-stop.png			\
++	stock-icons/16/gtk-execute.png			\
++	stock-icons/16/gtk-spell-check.png		\
++	stock-icons/16/gtk-fullscreen.png		\
++	stock-icons/16/gtk-refresh.png			\
++	stock-icons/16/gtk-leave-fullscreen.png		\
++	stock-icons/16/gtk-sort-ascending.png		\
++	stock-icons/16/gtk-sort-descending.png		\
++	stock-icons/16/gtk-close.png			\
++	stock-icons/16/gtk-zoom-fit.png			\
++	stock-icons/16/gtk-zoom-in.png			\
++	stock-icons/16/gtk-zoom-100.png			\
++	stock-icons/16/gtk-zoom-out.png			\
++	stock-icons/24/gtk-quit.png			\
++	stock-icons/24/gtk-info.png			\
++	stock-icons/24/gtk-file.png			\
++	stock-icons/24/gtk-open.png			\
++	stock-icons/24/gtk-print-preview.png		\
++	stock-icons/24/gtk-print.png			\
++	stock-icons/24/gtk-properties.png		\
++	stock-icons/24/gtk-revert-to-saved-ltr.png	\
++	stock-icons/24/gtk-revert-to-saved-rtl.png	\
++	stock-icons/24/gtk-save-as.png			\
++	stock-icons/24/gtk-new.png			\
++	stock-icons/24/gtk-harddisk.png			\
++	stock-icons/24/gtk-clear.png			\
++	stock-icons/24/gtk-copy.png			\
++	stock-icons/24/gtk-cut.png			\
++	stock-icons/24/gtk-delete.png			\
++	stock-icons/24/gtk-find-and-replace.png		\
++	stock-icons/24/gtk-find.png			\
++	stock-icons/24/gtk-paste.png			\
++	stock-icons/24/gtk-redo-ltr.png			\
++	stock-icons/24/gtk-redo-rtl.png			\
++	stock-icons/24/gtk-select-all.png		\
++	stock-icons/24/gtk-undo-ltr.png			\
++	stock-icons/24/gtk-undo-rtl.png			\
++	stock-icons/24/gtk-directory.png		\
++	stock-icons/24/gtk-unindent-ltr.png		\
++	stock-icons/24/gtk-unindent-rtl.png		\
++	stock-icons/24/gtk-indent-ltr.png		\
++	stock-icons/24/gtk-indent-rtl.png		\
++	stock-icons/24/gtk-justify-center.png		\
++	stock-icons/24/gtk-justify-fill.png		\
++	stock-icons/24/gtk-justify-left.png		\
++	stock-icons/24/gtk-justify-right.png		\
++	stock-icons/24/gtk-bold.png			\
++	stock-icons/24/gtk-italic.png			\
++	stock-icons/24/gtk-strikethrough.png		\
++	stock-icons/24/gtk-underline.png		\
++	stock-icons/24/gtk-goto-bottom.png		\
++	stock-icons/24/gtk-go-down.png			\
++	stock-icons/24/gtk-goto-first-ltr.png		\
++	stock-icons/24/gtk-home.png			\
++	stock-icons/24/gtk-jump-to-ltr.png		\
++	stock-icons/24/gtk-jump-to-rtl.png		\
++	stock-icons/24/gtk-goto-last-ltr.png		\
++	stock-icons/24/gtk-go-forward-ltr.png		\
++	stock-icons/24/gtk-go-back-ltr.png		\
++	stock-icons/24/gtk-goto-top.png			\
++	stock-icons/24/gtk-go-up.png			\
++	stock-icons/24/gtk-about.png			\
++	stock-icons/24/gtk-help.png			\
++	stock-icons/24/gtk-missing-image.png		\
++	stock-icons/24/gtk-add.png			\
++	stock-icons/24/gtk-remove.png			\
++	stock-icons/24/gtk-floppy.png			\
++	stock-icons/24/gtk-cdrom.png			\
++	stock-icons/24/gtk-media-pause.png		\
++	stock-icons/24/gtk-media-play-ltr.png		\
++	stock-icons/24/gtk-media-play-rtl.png		\
++	stock-icons/24/gtk-media-stop.png		\
++	stock-icons/24/gtk-media-record.png		\
++	stock-icons/24/gtk-media-rewind-ltr.png		\
++	stock-icons/24/gtk-media-forward-ltr.png	\
++	stock-icons/24/gtk-media-previous-ltr.png	\
++	stock-icons/24/gtk-media-next-ltr.png		\
++	stock-icons/24/gtk-network.png			\
++	stock-icons/24/gtk-print-error.png		\
++	stock-icons/24/gtk-print-report.png		\
++	stock-icons/24/gtk-print-paused.png		\
++	stock-icons/24/gtk-print-warning.png		\
++	stock-icons/24/gtk-stop.png			\
++	stock-icons/24/gtk-execute.png			\
++	stock-icons/24/gtk-spell-check.png		\
++	stock-icons/24/gtk-fullscreen.png		\
++	stock-icons/24/gtk-refresh.png			\
++	stock-icons/24/gtk-leave-fullscreen.png		\
++	stock-icons/24/gtk-sort-ascending.png		\
++	stock-icons/24/gtk-sort-descending.png		\
++	stock-icons/24/gtk-close.png			\
++	stock-icons/24/gtk-zoom-fit.png			\
++	stock-icons/24/gtk-zoom-in.png			\
++	stock-icons/24/gtk-zoom-100.png			\
++	stock-icons/24/gtk-zoom-out.png
+ 
+ @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
+ @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
+@@ -2869,6 +3033,88 @@ stamp-icons: $(STOCK_ICONS)
+ 	   && $(LN_S) folder.png user-desktop.png 			\
+ 	   && $(RM) text-x-generic.png 					\
+ 	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
++	   && $(LN_S) application-exit.png gtk-quit.png			\
++	   && $(LN_S) dialog-info.png gtk-info.png			\
++	   && $(LN_S) document-new.png gtk-file.png			\
++	   && $(LN_S) document-open.png gtk-open.png			\
++	   && $(LN_S) document-print-preview.png gtk-print-preview.png			\
++	   && $(LN_S) document-print.png gtk-print.png			\
++	   && $(LN_S) document-properties.png gtk-properties.png			\
++	   && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png			\
++	   && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png			\
++	   && $(LN_S) document-save-as.png gtk-save-as.png			\
++	   && $(LN_S) document-x-generic.png gtk-new.png			\
++	   && $(LN_S) drive-harddisk.png gtk-harddisk.png			\
++	   && $(LN_S) edit-clear.png gtk-clear.png			\
++	   && $(LN_S) edit-copy.png gtk-copy.png			\
++	   && $(LN_S) edit-cut.png gtk-cut.png			\
++	   && $(LN_S) edit-delete.png gtk-delete.png			\
++	   && $(LN_S) edit-find-replace.png gtk-find-and-replace.png			\
++	   && $(LN_S) edit-find.png gtk-find.png			\
++	   && $(LN_S) edit-paste.png gtk-paste.png			\
++	   && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png			\
++	   && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png			\
++	   && $(LN_S) edit-select-all.png gtk-select-all.png			\
++	   && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png			\
++	   && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png			\
++	   && $(LN_S) folder.png gtk-directory.png			\
++	   && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png			\
++	   && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png			\
++	   && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png			\
++	   && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png			\
++	   && $(LN_S) format-justify-center.png gtk-justify-center.png			\
++	   && $(LN_S) format-justify-fill.png gtk-justify-fill.png			\
++	   && $(LN_S) format-justify-left.png gtk-justify-left.png			\
++	   && $(LN_S) format-justify-right.png gtk-justify-right.png			\
++	   && $(LN_S) format-text-bold.png gtk-bold.png			\
++	   && $(LN_S) format-text-italic.png gtk-italic.png			\
++	   && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png			\
++	   && $(LN_S) format-text-underline.png gtk-underline.png			\
++	   && $(LN_S) go-bottom.png gtk-goto-bottom.png			\
++	   && $(LN_S) go-down.png gtk-go-down.png			\
++	   && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png			\
++	   && $(LN_S) go-home.png gtk-home.png			\
++	   && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png			\
++	   && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png			\
++	   && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png			\
++	   && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png			\
++	   && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png			\
++	   && $(LN_S) go-top.png gtk-goto-top.png			\
++	   && $(LN_S) go-up.png gtk-go-up.png			\
++	   && $(LN_S) help-about.png gtk-about.png			\
++	   && $(LN_S) help-contents.png gtk-help.png			\
++	   && $(LN_S) image-missing.png gtk-missing-image.png			\
++	   && $(LN_S) list-add.png gtk-add.png			\
++	   && $(LN_S) list-remove.png gtk-remove.png			\
++	   && $(LN_S) media-floppy.png gtk-floppy.png			\
++	   && $(LN_S) media-optical.png gtk-cdrom.png			\
++	   && $(LN_S) media-playback-pause.png gtk-media-pause.png			\
++	   && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png			\
++	   && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png			\
++	   && $(LN_S) media-playback-stop.png gtk-media-stop.png			\
++	   && $(LN_S) media-record.png gtk-media-record.png			\
++	   && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png			\
++	   && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png			\
++	   && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png			\
++	   && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png			\
++	   && $(LN_S) network-idle.png gtk-network.png			\
++	   && $(LN_S) printer-error.png gtk-print-error.png			\
++	   && $(LN_S) printer-info.png gtk-print-report.png			\
++	   && $(LN_S) printer-paused.png gtk-print-paused.png			\
++	   && $(LN_S) printer-warning.png gtk-print-warning.png			\
++	   && $(LN_S) process-stop.png gtk-stop.png			\
++	   && $(LN_S) system-run.png gtk-execute.png			\
++	   && $(LN_S) tools-check-spelling.png gtk-spell-check.png			\
++	   && $(LN_S) view-fullscreen.png gtk-fullscreen.png			\
++	   && $(LN_S) view-refresh.png gtk-refresh.png			\
++	   && $(LN_S) view-restore.png gtk-leave-fullscreen.png			\
++	   && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png			\
++	   && $(LN_S) view-sort-descending.png gtk-sort-descending.png			\
++	   && $(LN_S) window-close.png gtk-close.png			\
++	   && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png			\
++	   && $(LN_S) zoom-in.png gtk-zoom-in.png			\
++	   && $(LN_S) zoom-original.png gtk-zoom-100.png			\
++	   && $(LN_S) zoom-out.png gtk-zoom-out.png			\
+ 	) done 								\
+ 	&& touch stamp-icons
+