update to 2.22.1.1

This switches to the gnome-2.22 release branch.

7 files changed, 61 insertions, 92 deletions

diff --git a/print/evince/Makefile b/print/evince/Makefile
index 29dad766b21..1e1f680dc04 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2008/04/12 22:43:09 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2008/04/15 18:30:23 drochner Exp $
 
 .include "../../print/evince/Makefile.common"
 
-PKGREVISION=		3
-
 COMMENT=		Document viewer for the GNOME Desktop
 
 GCONF_SCHEMAS=		evince.schemas
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index add5f2a907c..b9d72534748 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.19 2007/11/28 21:02:11 drochner Exp $
+# $NetBSD: Makefile.common,v 1.20 2008/04/15 18:30:23 drochner Exp $
 #
 
-DISTNAME=		evince-2.20.2
+DISTNAME=		evince-2.22.1.1
 CATEGORIES=		print
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -26,6 +26,7 @@ pre-configure:
 	${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs
 	${CHMOD} +x ${BUILDLINK_DIR}/bin/gs
 
+BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.16.1
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
 BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.9
@@ -34,8 +35,8 @@ BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.9
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/print/evince/PLIST b/print/evince/PLIST
index 0644262adfb..ab5b602c947 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,6 +1,42 @@
-@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:09 jlam Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/04/15 18:30:23 drochner Exp $
 bin/evince
 bin/evince-thumbnailer
+include/evince-2.20/evince/ev-async-renderer.h
+include/evince-2.20/evince/ev-attachment.h
+include/evince-2.20/evince/ev-document-find.h
+include/evince-2.20/evince/ev-document-fonts.h
+include/evince-2.20/evince/ev-document-forms.h
+include/evince-2.20/evince/ev-document-images.h
+include/evince-2.20/evince/ev-document-info.h
+include/evince-2.20/evince/ev-document-links.h
+include/evince-2.20/evince/ev-document-misc.h
+include/evince-2.20/evince/ev-document-security.h
+include/evince-2.20/evince/ev-document-thumbnails.h
+include/evince-2.20/evince/ev-document-transition.h
+include/evince-2.20/evince/ev-document.h
+include/evince-2.20/evince/ev-file-exporter.h
+include/evince-2.20/evince/ev-file-helpers.h
+include/evince-2.20/evince/ev-form-field.h
+include/evince-2.20/evince/ev-image.h
+include/evince-2.20/evince/ev-link-action.h
+include/evince-2.20/evince/ev-link-dest.h
+include/evince-2.20/evince/ev-link.h
+include/evince-2.20/evince/ev-render-context.h
+include/evince-2.20/evince/ev-selection.h
+include/evince-2.20/evince/ev-transition-effect.h
+lib/evince/backends/comicsdocument.evince-backend
+lib/evince/backends/djvudocument.evince-backend
+lib/evince/backends/dvidocument.evince-backend
+lib/evince/backends/libcomicsdocument.la
+lib/evince/backends/libdjvudocument.la
+lib/evince/backends/libdvidocument.la
+lib/evince/backends/libpdfdocument.la
+lib/evince/backends/libpsdocument.la
+lib/evince/backends/libtiffdocument.la
+lib/evince/backends/pdfdocument.evince-backend
+lib/evince/backends/psdocument.evince-backend
+lib/evince/backends/tiffdocument.evince-backend
+lib/libevbackend.la
 man/man1/evince.1
 share/applications/evince.desktop
 share/evince/evince-password.glade
@@ -68,6 +104,8 @@ share/gnome/help/evince/sv/evince.xml
 share/gnome/help/evince/sv/figures/evince_start_window.png
 share/gnome/help/evince/uk/evince.xml
 share/gnome/help/evince/uk/figures/evince_start_window.png
+share/gnome/help/evince/zh_CN/evince.xml
+share/gnome/help/evince/zh_CN/figures/evince_start_window.png
 share/gtk-doc/html/evince/EvAttachment.html
 share/gtk-doc/html/evince/EvJobPrint.html
 share/gtk-doc/html/evince/EvNavigationAction.html
@@ -106,7 +144,6 @@ share/gtk-doc/html/evince/evince-ev-link.html
 share/gtk-doc/html/evince/evince-ev-metadata-manager.html
 share/gtk-doc/html/evince/evince-ev-page-cache.html
 share/gtk-doc/html/evince/evince-ev-pixbuf-cache.html
-share/gtk-doc/html/evince/evince-ev-print-job.html
 share/gtk-doc/html/evince/evince-ev-properties-dialog.html
 share/gtk-doc/html/evince/evince-ev-properties-fonts.html
 share/gtk-doc/html/evince/evince-ev-selection.html
@@ -136,6 +173,7 @@ share/icons/hicolor/24x24/apps/evince.png
 share/icons/hicolor/48x48/apps/evince.png
 share/icons/hicolor/scalable/apps/evince.svg
 share/locale/ar/LC_MESSAGES/evince.mo
+share/locale/as/LC_MESSAGES/evince.mo
 share/locale/be/LC_MESSAGES/evince.mo
 share/locale/be@latin/LC_MESSAGES/evince.mo
 share/locale/bg/LC_MESSAGES/evince.mo
@@ -157,6 +195,7 @@ share/locale/eu/LC_MESSAGES/evince.mo
 share/locale/fa/LC_MESSAGES/evince.mo
 share/locale/fi/LC_MESSAGES/evince.mo
 share/locale/fr/LC_MESSAGES/evince.mo
+share/locale/ga/LC_MESSAGES/evince.mo
 share/locale/gl/LC_MESSAGES/evince.mo
 share/locale/gu/LC_MESSAGES/evince.mo
 share/locale/he/LC_MESSAGES/evince.mo
@@ -166,6 +205,7 @@ share/locale/id/LC_MESSAGES/evince.mo
 share/locale/it/LC_MESSAGES/evince.mo
 share/locale/ja/LC_MESSAGES/evince.mo
 share/locale/ka/LC_MESSAGES/evince.mo
+share/locale/kn/LC_MESSAGES/evince.mo
 share/locale/ko/LC_MESSAGES/evince.mo
 share/locale/ku/LC_MESSAGES/evince.mo
 share/locale/lt/LC_MESSAGES/evince.mo
@@ -187,6 +227,7 @@ share/locale/pt_BR/LC_MESSAGES/evince.mo
 share/locale/ro/LC_MESSAGES/evince.mo
 share/locale/ru/LC_MESSAGES/evince.mo
 share/locale/rw/LC_MESSAGES/evince.mo
+share/locale/si/LC_MESSAGES/evince.mo
 share/locale/sk/LC_MESSAGES/evince.mo
 share/locale/sl/LC_MESSAGES/evince.mo
 share/locale/sq/LC_MESSAGES/evince.mo
@@ -220,8 +261,9 @@ share/omf/evince/evince-ru.omf
 share/omf/evince/evince-sr.omf
 share/omf/evince/evince-sv.omf
 share/omf/evince/evince-uk.omf
+share/omf/evince/evince-zh_CN.omf
 @dirrm share/omf/evince
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
@@ -229,6 +271,8 @@ share/omf/evince/evince-uk.omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gtk-doc/html/evince
+@dirrm share/gnome/help/evince/zh_CN/figures
+@dirrm share/gnome/help/evince/zh_CN
 @dirrm share/gnome/help/evince/uk/figures
 @dirrm share/gnome/help/evince/uk
 @dirrm share/gnome/help/evince/sv/figures
@@ -280,3 +324,7 @@ share/omf/evince/evince-uk.omf
 @dirrm share/evince/icons
 @dirrm share/evince
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/evince/backends
+@dirrm lib/evince
+@dirrm include/evince-2.20/evince
+@dirrm include/evince-2.20
diff --git a/print/evince/distinfo b/print/evince/distinfo
index b273f9bdc0b..bd47db54d24 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.16 2007/12/16 11:39:43 drochner Exp $
+$NetBSD: distinfo,v 1.17 2008/04/15 18:30:23 drochner Exp $
 
-SHA1 (evince-2.20.2.tar.bz2) = 9d8d847314d728e579009eae76f2a84e17c9c893
-RMD160 (evince-2.20.2.tar.bz2) = 25daf214a29a2ead7161574852fd89c5bb6a848b
-Size (evince-2.20.2.tar.bz2) = 1614179 bytes
-SHA1 (patch-ae) = 32372279348e1b6b4027bed08b35270e71713445
-SHA1 (patch-ag) = eecbae054602e199963632e0ca0a538695ef4a5f
-SHA1 (patch-ah) = be13cbe2b72ef7233dce9da901a72982bce442d9
+SHA1 (evince-2.22.1.1.tar.bz2) = 8564efb17ec8d87b8f7fe0524ba18cb90121cc56
+RMD160 (evince-2.22.1.1.tar.bz2) = f5f37251dfad5161e9d6f9c09512d6690ef7eaa3
+Size (evince-2.22.1.1.tar.bz2) = 1648635 bytes
diff --git a/print/evince/patches/patch-ae b/print/evince/patches/patch-ae
deleted file mode 100644
index 4593094af92..00000000000
--- a/print/evince/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2007/11/03 16:12:48 drochner Exp $
-
---- configure.orig	2007-10-15 22:46:50.000000000 +0200
-+++ configure
-@@ -26000,7 +26000,7 @@ else
- echo "${ECHO_T}yes" >&6
- 	enable_cairo_pdf=yes
- fi
--	    if test x$enable_cairo_pdf == xyes; then
-+	    if test x$enable_cairo_pdf = xyes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CAIRO_PDF 1
-@@ -26079,7 +26079,7 @@ else
- echo "${ECHO_T}yes" >&6
- 	enable_cairo_ps=yes
- fi
--	    if test x$enable_cairo_ps == xyes; then
-+	    if test x$enable_cairo_ps = xyes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CAIRO_PS 1
diff --git a/print/evince/patches/patch-ag b/print/evince/patches/patch-ag
deleted file mode 100644
index 24c521ba7a0..00000000000
--- a/print/evince/patches/patch-ag
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/11/03 16:12:48 drochner Exp $
-
---- backend/comics/comics-document.c.orig	2007-09-17 18:19:23.000000000 +0200
-+++ backend/comics/comics-document.c
-@@ -106,7 +106,7 @@ comics_document_load (EvDocument *docume
- {
- 	ComicsDocument *comics_document = COMICS_DOCUMENT (document);
- 	GSList *supported_extensions;
--	gchar *list_files_command = NULL, *stdout, *quoted_file, *mime_type;
-+	gchar *list_files_command = NULL, *xstdout, *quoted_file, *mime_type;
- 	gchar **cbr_files;
- 	gboolean success;
- 	int i, retval;
-@@ -137,7 +137,7 @@ comics_document_load (EvDocument *docume
- 
- 	/* Get list of files in archive */
- 	success = g_spawn_command_line_sync (list_files_command,
--					     &stdout, NULL, &retval, error);
-+					     &xstdout, NULL, &retval, error);
- 	g_free (list_files_command);
- 
- 	if (!success) {
-@@ -152,7 +152,7 @@ comics_document_load (EvDocument *docume
- 		return FALSE;
- 	}
- 
--	cbr_files = g_strsplit (stdout, "\n", 0);
-+	cbr_files = g_strsplit (xstdout, "\n", 0);
- 	supported_extensions = get_supported_image_extensions ();
- 	for (i = 0; cbr_files[i] != NULL; i++) {
- 		gchar *suffix = g_strrstr (cbr_files[i], ".");
-@@ -173,7 +173,7 @@ comics_document_load (EvDocument *docume
- 		g_free (suffix);
- 	}
- 
--	g_free (stdout);
-+	g_free (xstdout);
- 	g_free (mime_type);
- 	g_strfreev (cbr_files);
- 	g_slist_foreach (supported_extensions, (GFunc) g_free, NULL);
diff --git a/print/evince/patches/patch-ah b/print/evince/patches/patch-ah
deleted file mode 100644
index ac98fc95c64..00000000000
--- a/print/evince/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/12/16 11:39:43 drochner Exp $
-
---- libdocument/ev-attachment.c.orig	2007-12-16 10:40:27.000000000 +0100
-+++ libdocument/ev-attachment.c
-@@ -396,7 +396,7 @@ ev_attachment_open (EvAttachment *attach
- 		if (ev_attachment_save (attachment, uri, error)) {
- 			if (attachment->priv->tmp_uri)
- 				g_free (attachment->priv->tmp_uri);
--			attachment->priv->tmp_uri = g_strdup (filename);
-+			attachment->priv->tmp_uri = g_strdup (uri);
- 
- 			retval = ev_attachment_launch_app (attachment, error);
- 		}