[arch-commits] Commit in evolution/trunk (PKGBUILD df0e8e.patch)

[Antonio Rojas]

    Date: Monday, January 11, 2016 @ 22:41:45
  Author: arojas
Revision: 257953

libical 2.0 rebuild

Added:
  evolution/trunk/df0e8e.patch
Modified:
  evolution/trunk/PKGBUILD

--------------+
 PKGBUILD     |   13 ++++++++++---
 df0e8e.patch |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-11 19:13:11 UTC (rev 257952)
+++ PKGBUILD	2016-01-11 21:41:45 UTC (rev 257953)
@@ -5,7 +5,7 @@
 pkgbase=evolution
 pkgname=('evolution' 'evolution-bogofilter' 'evolution-spamassassin')
 pkgver=3.18.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Manage your email, contacts and schedule"
 arch=(i686 x86_64)
 license=(GPL)
@@ -12,9 +12,16 @@
 makedepends=(intltool itstool docbook-xsl networkmanager bogofilter spamassassin highlight gnome-desktop evolution-data-server libcanberra libpst libytnef desktop-file-utils dconf gtkspell3 webkitgtk libcryptui gnome-common gtk-doc)
 options=('!emptydirs')
 url=https://wiki.gnome.org/Apps/Evolution
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz df0e8e.patch)
+sha256sums=('f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9'
+            'df14c084468834cd4389313a22444fe3c906eadc3379c5b3a17fd99f1fba8bcc')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build with libical 2.0 https://bugzilla.gnome.org/show_bug.cgi?id=760365
+  patch -p1 -i ../df0e8e.patch
+}
+
 build() {
   cd $pkgbase-$pkgver
 

Added: df0e8e.patch
===================================================================
--- df0e8e.patch	                        (rev 0)
+++ df0e8e.patch	2016-01-11 21:41:45 UTC (rev 257953)
@@ -0,0 +1,22 @@
+From df0e8e5fc9b95ee5c60b4734066c7c541377bbf4 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas at archlinux.org>
+Date: Mon, 11 Jan 2016 22:08:39 +0100
+Subject: [PATCH] Bug 760365 - [Calendar] Include libical/vcc.h directly
+
+This fixes a build break when using libical 2.0.
+---
+ calendar/importers/icalendar-importer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
+index 14f75a8..c255315 100644
+--- a/calendar/importers/icalendar-importer.c
++++ b/calendar/importers/icalendar-importer.c
+@@ -36,6 +36,7 @@
+ 
+ #include <libecal/libecal.h>
+ #include <libical/icalvcal.h>
++#include <libical/vcc.h>
+ 
+ #include "shell/e-shell.h"
+