update to 2.22.1

This switches to the gnome-2.22 release branch.

4 files changed, 41 insertions, 33 deletions

diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index c5cd6ff2fb1..88855ef204b 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2008/03/06 14:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2008/04/15 18:34:32 drochner Exp $
 #
 
-DISTNAME=	eog-2.20.4
-PKGREVISION=	2
+DISTNAME=	eog-2.22.1
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -38,8 +37,6 @@ BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.20.0
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.shared-mime-info+= shared-mime-info>=0.20
 .include "../../databases/shared-mime-info/buildlink3.mk"
diff --git a/graphics/eog/PLIST b/graphics/eog/PLIST
index 8ea4963a90e..c5a1c6e4b96 100644
--- a/graphics/eog/PLIST
+++ b/graphics/eog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/11/29 20:37:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/15 18:34:32 drochner Exp $
 bin/eog
 include/eog-2.20/eog/eog-application.h
 include/eog-2.20/eog/eog-debug.h
@@ -23,9 +23,11 @@ include/eog-2.20/eog/eog-transform.h
 include/eog-2.20/eog/eog-window.h
 lib/pkgconfig/eog.pc
 share/applications/eog.desktop
+share/eog/eog-image-properties-dialog.glade
+share/eog/eog-multiple-save-as-dialog.glade
+share/eog/eog-preferences-dialog.glade
 share/eog/eog-toolbar.xml
 share/eog/eog-ui.xml
-share/eog/eog.glade
 share/eog/gtkrc
 share/eog/icons/hicolor/16x16/actions/eog-image-collection.png
 share/eog/icons/hicolor/16x16/actions/eog-plugin.png
@@ -41,55 +43,76 @@ share/gconf/schemas/eog.schemas
 share/gnome/help/eog/C/eog.xml
 share/gnome/help/eog/C/figures/eog_save_as_window.png
 share/gnome/help/eog/C/figures/eog_start_window.png
+share/gnome/help/eog/C/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/C/legal.xml
+share/gnome/help/eog/da/eog.xml
+share/gnome/help/eog/da/figures/eog_save_as_window.png
+share/gnome/help/eog/da/figures/eog_start_window.png
+share/gnome/help/eog/da/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/de/eog.xml
 share/gnome/help/eog/de/figures/eog_save_as_window.png
 share/gnome/help/eog/de/figures/eog_start_window.png
+share/gnome/help/eog/de/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/en_GB/eog.xml
 share/gnome/help/eog/en_GB/figures/eog_save_as_window.png
 share/gnome/help/eog/en_GB/figures/eog_start_window.png
+share/gnome/help/eog/en_GB/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/es/eog.xml
 share/gnome/help/eog/es/figures/eog_save_as_window.png
 share/gnome/help/eog/es/figures/eog_start_window.png
+share/gnome/help/eog/es/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/eu/eog.xml
+share/gnome/help/eog/eu/figures/eog_save_as_window.png
 share/gnome/help/eog/eu/figures/eog_start_window.png
-share/gnome/help/eog/eu/legal.xml
+share/gnome/help/eog/eu/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/fr/eog.xml
 share/gnome/help/eog/fr/figures/eog_save_as_window.png
 share/gnome/help/eog/fr/figures/eog_start_window.png
+share/gnome/help/eog/fr/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/it/eog.xml
 share/gnome/help/eog/it/figures/eog_save_as_window.png
 share/gnome/help/eog/it/figures/eog_start_window.png
+share/gnome/help/eog/it/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/ja/eog.xml
+share/gnome/help/eog/ja/figures/eog_save_as_window.png
 share/gnome/help/eog/ja/figures/eog_start_window.png
-share/gnome/help/eog/ja/legal.xml
+share/gnome/help/eog/ja/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/ko/eog.xml
 share/gnome/help/eog/ko/figures/eog_save_as_window.png
 share/gnome/help/eog/ko/figures/eog_start_window.png
+share/gnome/help/eog/ko/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/oc/eog.xml
 share/gnome/help/eog/oc/figures/eog_save_as_window.png
 share/gnome/help/eog/oc/figures/eog_start_window.png
+share/gnome/help/eog/oc/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/pa/eog.xml
 share/gnome/help/eog/pa/figures/eog_save_as_window.png
 share/gnome/help/eog/pa/figures/eog_start_window.png
+share/gnome/help/eog/pa/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/pt_BR/eog.xml
 share/gnome/help/eog/pt_BR/figures/eog_save_as_window.png
 share/gnome/help/eog/pt_BR/figures/eog_start_window.png
+share/gnome/help/eog/pt_BR/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/ru/eog.xml
 share/gnome/help/eog/ru/figures/eog_save_as_window.png
 share/gnome/help/eog/ru/figures/eog_start_window.png
+share/gnome/help/eog/ru/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/sv/eog.xml
 share/gnome/help/eog/sv/figures/eog_save_as_window.png
 share/gnome/help/eog/sv/figures/eog_start_window.png
+share/gnome/help/eog/sv/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/uk/eog.xml
 share/gnome/help/eog/uk/figures/eog_save_as_window.png
 share/gnome/help/eog/uk/figures/eog_start_window.png
+share/gnome/help/eog/uk/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/zh_CN/eog.xml
+share/gnome/help/eog/zh_CN/figures/eog_save_as_window.png
 share/gnome/help/eog/zh_CN/figures/eog_start_window.png
-share/gnome/help/eog/zh_CN/legal.xml
+share/gnome/help/eog/zh_CN/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/zh_TW/eog.xml
+share/gnome/help/eog/zh_TW/figures/eog_save_as_window.png
 share/gnome/help/eog/zh_TW/figures/eog_start_window.png
-share/gnome/help/eog/zh_TW/legal.xml
+share/gnome/help/eog/zh_TW/figures/eog_toolbar_editor_window.png
 share/icons/hicolor/16x16/apps/eog.png
 share/icons/hicolor/22x22/apps/eog.png
 share/icons/hicolor/24x24/apps/eog.png
@@ -98,6 +121,7 @@ share/icons/hicolor/scalable/apps/eog.svg
 share/locale/af/LC_MESSAGES/eog.mo
 share/locale/am/LC_MESSAGES/eog.mo
 share/locale/ar/LC_MESSAGES/eog.mo
+share/locale/as/LC_MESSAGES/eog.mo
 share/locale/az/LC_MESSAGES/eog.mo
 share/locale/be/LC_MESSAGES/eog.mo
 share/locale/be@latin/LC_MESSAGES/eog.mo
@@ -141,6 +165,7 @@ share/locale/mg/LC_MESSAGES/eog.mo
 share/locale/mk/LC_MESSAGES/eog.mo
 share/locale/ml/LC_MESSAGES/eog.mo
 share/locale/mn/LC_MESSAGES/eog.mo
+share/locale/mr/LC_MESSAGES/eog.mo
 share/locale/ms/LC_MESSAGES/eog.mo
 share/locale/nb/LC_MESSAGES/eog.mo
 share/locale/ne/LC_MESSAGES/eog.mo
@@ -170,8 +195,6 @@ share/locale/tk/LC_MESSAGES/eog.mo
 share/locale/tr/LC_MESSAGES/eog.mo
 share/locale/ug/LC_MESSAGES/eog.mo
 share/locale/uk/LC_MESSAGES/eog.mo
-share/locale/uz/LC_MESSAGES/eog.mo
-share/locale/uz@cyrillic/LC_MESSAGES/eog.mo
 share/locale/vi/LC_MESSAGES/eog.mo
 share/locale/wa/LC_MESSAGES/eog.mo
 share/locale/xh/LC_MESSAGES/eog.mo
@@ -180,6 +203,7 @@ share/locale/zh_HK/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
 share/locale/zu/LC_MESSAGES/eog.mo
 share/omf/eog/eog-C.omf
+share/omf/eog/eog-da.omf
 share/omf/eog/eog-de.omf
 share/omf/eog/eog-en_GB.omf
 share/omf/eog/eog-es.omf
@@ -236,6 +260,8 @@ share/omf/eog/eog-zh_TW.omf
 @dirrm share/gnome/help/eog/en_GB
 @dirrm share/gnome/help/eog/de/figures
 @dirrm share/gnome/help/eog/de
+@dirrm share/gnome/help/eog/da/figures
+@dirrm share/gnome/help/eog/da
 @dirrm share/gnome/help/eog/C/figures
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/help/eog
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 650a7d357da..0960bcc1904 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2008/01/11 13:37:01 drochner Exp $
+$NetBSD: distinfo,v 1.8 2008/04/15 18:34:32 drochner Exp $
 
-SHA1 (eog-2.20.4.tar.bz2) = d129f2ac01cc7b8d70c880d4b277d70c3d236e19
-RMD160 (eog-2.20.4.tar.bz2) = dc7ea74ae89beb3369795a3c8c91538f2b9c679d
-Size (eog-2.20.4.tar.bz2) = 1666532 bytes
+SHA1 (eog-2.22.1.tar.bz2) = 61d0d400156eae2c7003fa0a5c5da726628af783
+RMD160 (eog-2.22.1.tar.bz2) = 21b853eab19ceb0c9dd9a9180676d2aefaaa84d3
+Size (eog-2.22.1.tar.bz2) = 1860876 bytes
 SHA1 (patch-ab) = e3da0c7d31c2508e51f6df6e36fc624995c6137e
-SHA1 (patch-ac) = d3eb6261275131400c332285147bccbf82e8f1dc
diff --git a/graphics/eog/patches/patch-ac b/graphics/eog/patches/patch-ac
deleted file mode 100644
index fa84b7b73b2..00000000000
--- a/graphics/eog/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/11/03 16:22:56 drochner Exp $
-
---- src/main.c.orig	2007-10-15 21:19:11.000000000 +0200
-+++ src/main.c
-@@ -218,7 +218,9 @@ main (int argc, char **argv)
- 
- 	load_files ();
- 
-+	gdk_threads_enter();
- 	gtk_main ();
-+	gdk_threads_leave();
- 
- 	gnome_accelerators_sync ();
-