cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to evolution-3.6.1.

Browse Source
This commit is contained in:
ajacoutot 2012-10-14 09:20:59 +00:00
parent f33a3cf06d
commit 47441a883b
3 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/evolution/Makefile
View File

@ -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

4
mail/evolution/distinfo
View File

@ -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

34
mail/evolution/patches/patch-modules_text-highlight_e-mail-formatter-text-highlight_c
View File

@ -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 ();