update to 2.20.1

This switches to the new gnome-2.20 branch.

7 files changed, 98 insertions, 19 deletions

diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index 77f61db83f7..ef7a379fca9 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2007/09/21 13:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/11/03 16:12:48 drochner Exp $
 #
 
 .include "../../print/evince/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION=		4
 
 COMMENT=		File properties plugin for evince files
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
diff --git a/print/evince/Makefile b/print/evince/Makefile
index ecca66bc52f..8815e06e875 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2007/09/21 13:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/11/03 16:12:48 drochner Exp $
 #
 
 .include "../../print/evince/Makefile.common"
 
 COMMENT=		Document viewer for the GNOME Desktop
-PKGREVISION=		2
 
 GCONF_SCHEMAS=		evince.schemas
 GCONF_SCHEMAS+=	evince-thumbnailer.schemas
@@ -34,6 +33,9 @@ GCONF_SCHEMAS+=	evince-thumbnailer-djvu.schemas
 PLIST_SUBST+=		DJVU="@comment "
 .endif
 
+CONFIGURE_ARGS+=	--enable-comics
+GCONF_SCHEMAS+=	evince-thumbnailer-comics.schemas
+
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../devel/GConf/schemas.mk"
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index a06b2fb4b65..d455d1ec30f 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.17 2007/09/21 13:04:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/11/03 16:12:48 drochner Exp $
 #
 
-DISTNAME=		evince-0.8.3
+DISTNAME=		evince-2.20.1
 CATEGORIES=		print
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/0.8/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -28,7 +28,7 @@ pre-configure:
 
 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.3
+BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.9
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/print/evince/PLIST b/print/evince/PLIST
index be5e7d601a2..cbd888e994b 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.16 2007/09/25 10:54:17 hira Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/11/03 16:12:48 drochner Exp $
 bin/evince
 bin/evince-thumbnailer
 man/man1/evince.1
 share/applications/evince.desktop
 share/evince/evince-password.glade
-share/evince/evince-preview-toolbar.xml
 share/evince/evince-properties.glade
 share/evince/evince-toolbar.xml
 share/evince/evince-ui.xml
@@ -13,18 +12,26 @@ share/evince/icons/hicolor/16x16/actions/view-page-continuous.png
 share/evince/icons/hicolor/16x16/actions/view-page-facing.png
 share/evince/icons/hicolor/16x16/actions/zoom-fit-page.png
 share/evince/icons/hicolor/16x16/actions/zoom-fit-width.png
+share/evince/icons/hicolor/16x16/actions/zoom.png
 share/evince/icons/hicolor/22x22/actions/view-page-continuous.png
 share/evince/icons/hicolor/22x22/actions/view-page-facing.png
 share/evince/icons/hicolor/22x22/actions/zoom-fit-page.png
 share/evince/icons/hicolor/22x22/actions/zoom-fit-width.png
+share/evince/icons/hicolor/22x22/actions/zoom.png
 share/evince/icons/hicolor/24x24/actions/view-page-continuous.png
 share/evince/icons/hicolor/24x24/actions/view-page-facing.png
 share/evince/icons/hicolor/24x24/actions/zoom-fit-page.png
 share/evince/icons/hicolor/24x24/actions/zoom-fit-width.png
+share/evince/icons/hicolor/24x24/actions/zoom.png
+share/evince/icons/hicolor/32x32/actions/view-page-continuous.png
+share/evince/icons/hicolor/32x32/actions/view-page-facing.png
+share/evince/icons/hicolor/48x48/actions/view-page-continuous.png
+share/evince/icons/hicolor/48x48/actions/view-page-facing.png
+share/gconf/schemas/evince-thumbnailer-comics.schemas
 ${DJVU}share/gconf/schemas/evince-thumbnailer-djvu.schemas
 ${DVI}share/gconf/schemas/evince-thumbnailer-dvi.schemas
-share/gconf/schemas/evince-thumbnailer.schemas
 share/gconf/schemas/evince-thumbnailer-ps.schemas
+share/gconf/schemas/evince-thumbnailer.schemas
 share/gconf/schemas/evince.schemas
 share/gnome/help/evince/C/evince.xml
 share/gnome/help/evince/C/figures/evince_start_window.png
@@ -45,8 +52,14 @@ share/gnome/help/evince/fr/evince.xml
 share/gnome/help/evince/fr/figures/evince_start_window.png
 share/gnome/help/evince/it/evince.xml
 share/gnome/help/evince/it/figures/evince_start_window.png
+share/gnome/help/evince/ja/evince.xml
+share/gnome/help/evince/ja/figures/evince_start_window.png
 share/gnome/help/evince/nl/evince.xml
 share/gnome/help/evince/nl/figures/evince_start_window.png
+share/gnome/help/evince/oc/evince.xml
+share/gnome/help/evince/oc/figures/evince_start_window.png
+share/gnome/help/evince/pt_BR/evince.xml
+share/gnome/help/evince/pt_BR/figures/evince_start_window.png
 share/gnome/help/evince/ru/evince.xml
 share/gnome/help/evince/ru/figures/evince_start_window.png
 share/gnome/help/evince/sr/evince.xml
@@ -124,6 +137,7 @@ share/icons/hicolor/48x48/apps/evince.png
 share/icons/hicolor/scalable/apps/evince.svg
 share/locale/ar/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
 share/locale/bn/LC_MESSAGES/evince.mo
 share/locale/bn_IN/LC_MESSAGES/evince.mo
@@ -180,6 +194,7 @@ share/locale/sr/LC_MESSAGES/evince.mo
 share/locale/sr@Latn/LC_MESSAGES/evince.mo
 share/locale/sv/LC_MESSAGES/evince.mo
 share/locale/ta/LC_MESSAGES/evince.mo
+share/locale/te/LC_MESSAGES/evince.mo
 share/locale/th/LC_MESSAGES/evince.mo
 share/locale/tr/LC_MESSAGES/evince.mo
 share/locale/uk/LC_MESSAGES/evince.mo
@@ -197,7 +212,10 @@ share/omf/evince/evince-es.omf
 share/omf/evince/evince-fi.omf
 share/omf/evince/evince-fr.omf
 share/omf/evince/evince-it.omf
+share/omf/evince/evince-ja.omf
 share/omf/evince/evince-nl.omf
+share/omf/evince/evince-oc.omf
+share/omf/evince/evince-pt_BR.omf
 share/omf/evince/evince-ru.omf
 share/omf/evince/evince-sr.omf
 share/omf/evince/evince-sv.omf
@@ -219,8 +237,14 @@ share/omf/evince/evince-uk.omf
 @dirrm share/gnome/help/evince/sr
 @dirrm share/gnome/help/evince/ru/figures
 @dirrm share/gnome/help/evince/ru
+@dirrm share/gnome/help/evince/pt_BR/figures
+@dirrm share/gnome/help/evince/pt_BR
+@dirrm share/gnome/help/evince/oc/figures
+@dirrm share/gnome/help/evince/oc
 @dirrm share/gnome/help/evince/nl/figures
 @dirrm share/gnome/help/evince/nl
+@dirrm share/gnome/help/evince/ja/figures
+@dirrm share/gnome/help/evince/ja
 @dirrm share/gnome/help/evince/it/figures
 @dirrm share/gnome/help/evince/it
 @dirrm share/gnome/help/evince/fr/figures
@@ -242,6 +266,10 @@ share/omf/evince/evince-uk.omf
 @dirrm share/gnome/help/evince
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf: @dirrm share/gconf/schemas
+@dirrm share/evince/icons/hicolor/48x48/actions
+@dirrm share/evince/icons/hicolor/48x48
+@dirrm share/evince/icons/hicolor/32x32/actions
+@dirrm share/evince/icons/hicolor/32x32
 @dirrm share/evince/icons/hicolor/24x24/actions
 @dirrm share/evince/icons/hicolor/24x24
 @dirrm share/evince/icons/hicolor/22x22/actions
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 97119c6030c..92e63c2cfed 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2007/07/06 18:04:24 drochner Exp $
+$NetBSD: distinfo,v 1.14 2007/11/03 16:12:48 drochner Exp $
 
-SHA1 (evince-0.8.3.tar.bz2) = 981020c677e257b8749478b3c23d25a76b426baf
-RMD160 (evince-0.8.3.tar.bz2) = 49a84a59a8d059b62a3482f7a3a9bae1349f1de7
-Size (evince-0.8.3.tar.bz2) = 1515083 bytes
-SHA1 (patch-ae) = 833d535cea619fe2e7bc8540833dcd6d9e7641d1
+SHA1 (evince-2.20.1.tar.bz2) = 785813845e30794c31a688507d1628067241d5d1
+RMD160 (evince-2.20.1.tar.bz2) = 30e93bedf50ea968fea917f439bdd061203ba3d0
+Size (evince-2.20.1.tar.bz2) = 1613601 bytes
+SHA1 (patch-ae) = 32372279348e1b6b4027bed08b35270e71713445
+SHA1 (patch-ag) = eecbae054602e199963632e0ca0a538695ef4a5f
diff --git a/print/evince/patches/patch-ae b/print/evince/patches/patch-ae
index 7c5b778a553..4593094af92 100644
--- a/print/evince/patches/patch-ae
+++ b/print/evince/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2007/04/11 18:01:14 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2007/11/03 16:12:48 drochner Exp $
 
---- configure.orig	2007-04-04 15:57:38.000000000 +0200
+--- configure.orig	2007-10-15 22:46:50.000000000 +0200
 +++ configure
-@@ -25750,7 +25750,7 @@ else
+@@ -26000,7 +26000,7 @@ else
  echo "${ECHO_T}yes" >&6
  	enable_cairo_pdf=yes
  fi
@@ -11,3 +11,12 @@ $NetBSD: patch-ae,v 1.1 2007/04/11 18:01:14 drochner Exp $
  
  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
new file mode 100644
index 00000000000..24c521ba7a0
--- /dev/null
+++ b/print/evince/patches/patch-ag
@@ -0,0 +1,40 @@
+$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);