update to 2.22.1.1

This switches to the gnome-2.22 release branch.

3 files changed, 0 insertions, 75 deletions

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);
- 		}