Add a patch from upstream to allow building with libpst->=0.6.54.

This commit is contained in:
ajacoutot 2012-01-09 18:26:31 +00:00
parent 34f6032d93
commit dd0891e274
2 changed files with 22 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.153 2012/01/09 14:31:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.154 2012/01/09 18:26:31 ajacoutot Exp $
SHARED_ONLY= Yes
@ -11,6 +11,8 @@ GNOME_VERSION= 3.2.3
PKGNAME-main= ${DISTNAME}
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
REVISION-plugins= 0
# Only get the first x.y which is needed in the PLIST.
# NOTE: when major version changes, increment EVO_VERSION accordingly
# and bump:
@ -108,7 +110,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
LIB_DEPENDS-plugins= ${LIB_DEPENDS} \
mail/evolution,-main=${GNOME_VERSION} \
converters/libpst \
converters/libpst>=0.6.54 \
multimedia/gstreamer-0.10/core
# needed for the audio-inline plugin
RUN_DEPENDS-plugins= ${MODGCONF2_RUN_DEPENDS} \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-plugins_pst-import_pst-importer_c,v 1.1 2012/01/09 18:26:31 ajacoutot Exp $
From f15c6e4e8fcfce0b5d12871db6a48840dc34c38b Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Mon, 09 Jan 2012 17:17:54 +0000
Subject: Bug #667346 - Fix build with libpst 0.6.54 and require this version
--- plugins/pst-import/pst-importer.c.orig Mon Jan 9 18:42:15 2012
+++ plugins/pst-import/pst-importer.c Mon Jan 9 18:42:28 2012
@@ -2194,7 +2194,7 @@ pst_init (pst_file *pst,
DEBUG_REGISTER_CLOSE ();
#endif
- if (pst_open (pst, filename) < 0) {
+ if (pst_open (pst, filename, NULL) < 0) {
pst_error_msg ("Error opening PST file %s", filename);
return -1;
}