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

[Jan Steffens]

    Date: Monday, January 18, 2016 @ 20:01:12
  Author: heftig
Revision: 258385

3.18.4

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

--------------+
 PKGBUILD     |   11 ++++-------
 df0e8e.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-18 18:19:22 UTC (rev 258384)
+++ PKGBUILD	2016-01-18 19:01:12 UTC (rev 258385)
@@ -4,8 +4,8 @@
 
 pkgbase=evolution
 pkgname=('evolution' 'evolution-bogofilter' 'evolution-spamassassin')
-pkgver=3.18.3
-pkgrel=2
+pkgver=3.18.4
+pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=(i686 x86_64)
 license=(GPL)
@@ -12,14 +12,11 @@
 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 df0e8e.patch)
-sha256sums=('f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9'
-            'df14c084468834cd4389313a22444fe3c906eadc3379c5b3a17fd99f1fba8bcc')
+source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb')
 
 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() {

Deleted: df0e8e.patch
===================================================================
--- df0e8e.patch	2016-01-18 18:19:22 UTC (rev 258384)
+++ df0e8e.patch	2016-01-18 19:01:12 UTC (rev 258385)
@@ -1,22 +0,0 @@
-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"
-