[arch-commits] Commit in evolution-data-server/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, October 31, 2017 @ 12:15:53
  Author: heftig
Revision: 308758

3.26.2.1-1

Modified:
  evolution-data-server/trunk/PKGBUILD
Deleted:
  evolution-data-server/trunk/0001-Don-t-free-instance_recur_id-when-not-initialized.patch

--------------------------------------------------------------+
 0001-Don-t-free-instance_recur_id-when-not-initialized.patch |   30 ----------
 PKGBUILD                                                     |   13 +---
 2 files changed, 5 insertions(+), 38 deletions(-)

Deleted: 0001-Don-t-free-instance_recur_id-when-not-initialized.patch
===================================================================
--- 0001-Don-t-free-instance_recur_id-when-not-initialized.patch	2017-10-31 12:13:15 UTC (rev 308757)
+++ 0001-Don-t-free-instance_recur_id-when-not-initialized.patch	2017-10-31 12:15:53 UTC (rev 308758)
@@ -1,30 +0,0 @@
-From abc7de46102bfc2766a5c22ce59807db3d5638bb Mon Sep 17 00:00:00 2001
-Message-Id: <abc7de46102bfc2766a5c22ce59807db3d5638bb.1509410670.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 31 Oct 2017 01:35:34 +0100
-Subject: [PATCH] Don't free instance_recur_id when not initialized
-
-Caused chaos and confusing crashes in gnome-shell-calendar-server.
-
-Fixes efe14e5959. Found via bisect and again by valgrind.
----
- src/calendar/libecal/e-cal-client.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/calendar/libecal/e-cal-client.c b/src/calendar/libecal/e-cal-client.c
-index a4143ecd6749a884..546426243d35d008 100644
---- a/src/calendar/libecal/e-cal-client.c
-+++ b/src/calendar/libecal/e-cal-client.c
-@@ -2558,8 +2558,8 @@ process_detached_instances (GSList *instances,
- 						ci->comp = comp;
- 					}
- 				}
-+				e_cal_component_free_range (&instance_recur_id);
- 			}
--			e_cal_component_free_range (&instance_recur_id);
- 		}
- 
- 		e_cal_component_free_datetime (&recur_id.datetime);
--- 
-2.14.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-31 12:13:15 UTC (rev 308757)
+++ PKGBUILD	2017-10-31 12:15:53 UTC (rev 308758)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.26.2
-pkgrel=2
+pkgver=3.26.2.1
+pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 url="https://wiki.gnome.org/Apps/Evolution"
 arch=(i686 x86_64)
@@ -10,11 +10,9 @@
 depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata libphonenumber)
 makedepends=(intltool gperf gobject-introspection vala gtk-doc boost git cmake ninja)
 license=(GPL)
-_commit=1ef35fef0ed50d52cd2da6e8776429522708e3a5  # tags/EVOLUTION_DATA_SERVER_3_26_2^0
-source=("git+https://git.gnome.org/browse/evolution-data-server#commit=$_commit"
-        0001-Don-t-free-instance_recur_id-when-not-initialized.patch)
-sha256sums=('SKIP'
-            '9cadbaf8a38c59ca28494ae608466690d6cb72b4f82df4f10b35cbe57daf9e8a')
+_commit=7149f838ab4a908c1a8fc71fcac3a769b3043895  # tags/EVOLUTION_DATA_SERVER_3_26_2_1^0
+source=("git+https://git.gnome.org/browse/evolution-data-server#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -23,7 +21,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../0001-Don-t-free-instance_recur_id-when-not-initialized.patch
 }
 
 build() {