From d535b321ec8e9141ee7d09aaae1e7c66d46f70de9dbd3cddd56879b830bc30ae Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 5 Jan 2012 11:04:47 +0000 Subject: [PATCH] Accepting request 98862 from home:vuntz:branches:GNOME:Factory Fix build OBS-URL: https://build.opensuse.org/request/show/98862 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=151 --- evolution-libpst-0.6.54.patch | 13 +++++++++++++ evolution.changes | 5 +++++ evolution.spec | 6 ++++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 evolution-libpst-0.6.54.patch diff --git a/evolution-libpst-0.6.54.patch b/evolution-libpst-0.6.54.patch new file mode 100644 index 0000000..44d0464 --- /dev/null +++ b/evolution-libpst-0.6.54.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c +index 5b99053..4305827 100644 +--- a/plugins/pst-import/pst-importer.c ++++ b/plugins/pst-import/pst-importer.c +@@ -2219,7 +2219,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; + } diff --git a/evolution.changes b/evolution.changes index 2fddbd3..e51902a 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 5 10:33:18 UTC 2012 - vuntz@opensuse.org + +- Add evolution-libpst-0.6.54.patch: fix build with libpst 0.6.54. + ------------------------------------------------------------------- Tue Dec 20 13:30:37 UTC 2011 - vuntz@opensuse.org diff --git a/evolution.spec b/evolution.spec index 72534d6..79d86e1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,7 +1,7 @@ # # spec file for package evolution # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define USE_EVOLDAP 0 # wait for port of gtkimageview to gtk3 %define use_gtkimageview 0 @@ -81,6 +80,8 @@ Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite License: LGPL-2.0 ; LGPL-3.0 Group: Productivity/Networking/Email/Clients Source0: http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM evolution-libpst-0.6.54.patch bgo#667346 vuntz@opensuse.org -- Fix build with libpst 0.6.54 +Patch0: evolution-libpst-0.6.54.patch # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include Patch15: evolution-custom-openldap-includes.patch # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. @@ -170,6 +171,7 @@ Evolution or embed the existing ones in other applications. %prep %setup -q translation-update-upstream +%patch0 -p1 %if %USE_EVOLDAP %patch15 -p1 %endif