From 47441a883bf374bc231b0fe7d5a912769a484cbc Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 14 Oct 2012 09:20:59 +0000
Subject: [PATCH] Bugfix update to evolution-3.6.1.

---
 mail/evolution/Makefile                       |  7 ++--
 mail/evolution/distinfo                       |  4 +--
 ...ighlight_e-mail-formatter-text-highlight_c | 34 -------------------
 3 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 mail/evolution/patches/patch-modules_text-highlight_e-mail-formatter-text-highlight_c

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index dc34cc5425d..6915dd7691c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.177 2012/10/04 13:58:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.178 2012/10/14 09:20:59 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,14 +6,11 @@ COMMENT-main=		integrated email and PIM software for GNOME
 COMMENT-plugins=	additionnal plugins for evolution
 
 GNOME_PROJECT=		evolution
-GNOME_VERSION=		3.6.0
+GNOME_VERSION=		3.6.1
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-plugins=	evolution-plugins-${GNOME_VERSION}
 
-REVISION-main=		4
-REVISION-plugins=	2
-
 # NOTE: when R changes, increment EVO_VERSION accordingly and bump:
 # mail/evolution-ews
 # mail/evolution-rss
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index d9d1e6539e9..5cb0b198317 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-SHA256 (evolution-3.6.0.tar.xz) = YWPvVqIsp8YFqJ13SFHJmI14QKTcXHPFRjCOU4DP57Q=
-SIZE (evolution-3.6.0.tar.xz) = 12021428
+SHA256 (evolution-3.6.1.tar.xz) = eqBzDWgVzETb3nW0RkaX3Z1RWE9I6eA+hsLlylqXpSE=
+SIZE (evolution-3.6.1.tar.xz) = 12009744
diff --git a/mail/evolution/patches/patch-modules_text-highlight_e-mail-formatter-text-highlight_c b/mail/evolution/patches/patch-modules_text-highlight_e-mail-formatter-text-highlight_c
deleted file mode 100644
index 7ee5bf3cb00..00000000000
--- a/mail/evolution/patches/patch-modules_text-highlight_e-mail-formatter-text-highlight_c
+++ /dev/null
@@ -1,34 +0,0 @@
-$OpenBSD: patch-modules_text-highlight_e-mail-formatter-text-highlight_c,v 1.3 2012/10/04 13:58:17 ajacoutot Exp $
-
-From 1cfe0327ca436a687383412664e3a5c2869c7dda Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Thu, 04 Oct 2012 13:34:23 +0000
-Subject: portability: don't use too generic variable names
-
---- modules/text-highlight/e-mail-formatter-text-highlight.c.orig	Sun Sep 16 17:05:50 2012
-+++ modules/text-highlight/e-mail-formatter-text-highlight.c	Thu Oct  4 15:36:19 2012
-@@ -187,7 +187,7 @@ emfe_text_highlight_format (EMailFormatterExtension *e
- 		return TRUE;
- 
- 	} else if (context->mode == E_MAIL_FORMATTER_MODE_RAW) {
--		gint stdin, stdout;
-+		gint pipe_stdin, pipe_stdout;
- 		GPid pid;
- 		CamelStream *read, *write, *utf8;
- 		CamelDataWrapper *dw;
-@@ -262,12 +262,12 @@ emfe_text_highlight_format (EMailFormatterExtension *e
- 			NULL, (gchar **) argv, NULL,
- 			G_SPAWN_SEARCH_PATH |
- 			G_SPAWN_DO_NOT_REAP_CHILD,
--			NULL, NULL, &pid, &stdin, &stdout, NULL, NULL)) {
-+			NULL, NULL, &pid, &pipe_stdin, &pipe_stdout, NULL, NULL)) {
- 			return FALSE;
- 		}
- 
--		write = camel_stream_fs_new_with_fd (stdin);
--		read = camel_stream_fs_new_with_fd (stdout);
-+		write = camel_stream_fs_new_with_fd (pipe_stdin);
-+		read = camel_stream_fs_new_with_fd (pipe_stdout);
- 
- 		/* Decode the content of mime part to the 'utf8' stream */
- 		utf8 = camel_stream_mem_new ();