gentoo resync : 18.05.2019

4 files changed, 52 insertions, 3 deletions

diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 2aa13ea302d7..1c3b6037d8ef 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,6 @@
+AUX akonadi-calendar-18.12.3-korgac-crash.patch 1738 BLAKE2B d210ea7e6339a72aa73eb49a6cb1172a29529180e734a5a83465f9a01d641677109e105768d6556b4cc07a75fe3bbc41ac4a4ba1bc3e3691c6121a1df288a562 SHA512 8ad17dfbd42244532c6ea3cc5fb0bbdca756dc00de647b69a13240e4eb028302cb3d03e4741e31fbab5a0a04808bb1c75ffaa55c60de57b544284ee3c0c7b2c6
 DIST akonadi-calendar-18.12.3.tar.xz 333656 BLAKE2B 039a132cf2e8dcc5935a4027b9e8b757b9b0060a3eb0e209dc87e8ee22b75117aa2f137c1c3508587b741de10cc466a7c5c9fae127e9bfbb59ea0870cdd4c5d4 SHA512 aac520c64a66fdeb27a2394e3eb7e4f4f30b123f4e9bf35cd01bf421d67c6dcdaa2041037e50474dd98b737c6ecbcd6c57f30e0a4ac7d2996ad18ed839288967
-DIST akonadi-calendar-19.04.0.tar.xz 333400 BLAKE2B ad030a08fccd217b8cb9afa45551e07c3fe952cc8197fbddfc131eacb89a68b412ddd0f8ed5db7afc2d396c7d1039d1b7dc7d88f5cf8405a41a31a86445b27a6 SHA512 7b8e8a125295adaf8bd2a8eebf8b355f712415a8c762b0ce62cf30b4abfb641f3bf5ddaa3db360bf9b2ce480673e0422d62a161e37c887c22d645741fb1999cf
-EBUILD akonadi-calendar-18.12.3-r1.ebuild 1173 BLAKE2B c7c0becc3bfb980b5de9866fbbd3f89b42e7b430c667023e04432a521c0051b9151dadb5364062f4decccce6c89e82ed806dacf9cdbca57efcba0ace0e37ae24 SHA512 4ea83f044237ddb61f6d20d3b68a6752e42a3e38decde214bcb780169f3b145d843dd6324f3d5604c8fc6fe07412945ad4a8b48df62ffc07ba134d3d23110de9
-EBUILD akonadi-calendar-19.04.0.ebuild 1161 BLAKE2B 42025eaf42f7e40a4ff81ef955a3e53b61c29dc166b24d9ccacd3811580f5d45207ebd14e6f1e35de80f29d0dc0d71ca8f7cd00e207397197a6d4b45ccd436fe SHA512 e2924e0021b55535bd0426f4a367ea61ae4a3a05185c6dffe8549407f9547b658d3d0a8ce149f2f212cb805fee585ffa4d8b0bb2fb95b5f1dbb175559180e61c
+DIST akonadi-calendar-19.04.1.tar.xz 332412 BLAKE2B b6e94884f575204c5dea3253d42eae7493a60a6e2137b1b0cf42a15506a8f1949ba34b3543a55e1d85a9d24883b51458e68cb9029a375d319ff3c72f34da9876 SHA512 7a6ba5a6b8aa57af4991d1f8a74acbbd2ef463d145569e5bd0a29441c5430efbc3528e96640d59d6843b2f2c6d087188a032526223cf6e876095d7461fd2dc0c
+EBUILD akonadi-calendar-18.12.3-r2.ebuild 1224 BLAKE2B 37e9cf5134461ed6f0ab4942680f25fa1e4e33878737acff9ec9bed12e8c06507ebe6da4626968b47c4621462755ba56a574d394a0fb97bbc93d40b39aa48263 SHA512 0f24c17cae18f40f8253abaadd0f1e298423f63ca13ca47527fc13026a23bca7814046f945ed9db7eaaa6ef69ae1276a0be81fff2d3c37930be72a1549a45206
+EBUILD akonadi-calendar-19.04.1.ebuild 1161 BLAKE2B 42025eaf42f7e40a4ff81ef955a3e53b61c29dc166b24d9ccacd3811580f5d45207ebd14e6f1e35de80f29d0dc0d71ca8f7cd00e207397197a6d4b45ccd436fe SHA512 e2924e0021b55535bd0426f4a367ea61ae4a3a05185c6dffe8549407f9547b658d3d0a8ce149f2f212cb805fee585ffa4d8b0bb2fb95b5f1dbb175559180e61c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r2.ebuild
index b42a1ad15f13..8dceb3cf01e0 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r2.ebuild
@@ -43,4 +43,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-runtime-18.03.80
 "
 
+PATCHES=( "${FILESDIR}/${P}-korgac-crash.patch" )
+
 RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.04.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.04.1.ebuild
index c2875fb209bf..c2875fb209bf 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.04.0.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.04.1.ebuild
diff --git a/kde-apps/akonadi-calendar/files/akonadi-calendar-18.12.3-korgac-crash.patch b/kde-apps/akonadi-calendar/files/akonadi-calendar-18.12.3-korgac-crash.patch
new file mode 100644
index 000000000000..ca159c05d110
--- /dev/null
+++ b/kde-apps/akonadi-calendar/files/akonadi-calendar-18.12.3-korgac-crash.patch
@@ -0,0 +1,46 @@
+From c9129b07b42097f6b5eb54c2103d22a9c2263d83 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Wed, 27 Mar 2019 14:45:25 +0100
+Subject: Fix crash due to using an attribute from a collection that went out
+ of scope
+
+Summary: Probably a consequence of the const/non-const changes (detaching?)
+
+Test Plan:
+Untested, but based on a crash report by Allen, pointing to
+ETMCalendar::alarms() calling BlockAlarmsAttribute::isAlarmTypeBlocked
+on line 579.
+
+Reviewers: dvratil, winterz
+
+Reviewed By: dvratil
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D20079
+---
+ src/etmcalendar.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/etmcalendar.cpp b/src/etmcalendar.cpp
+index 295785d..75e131b 100644
+--- a/src/etmcalendar.cpp
++++ b/src/etmcalendar.cpp
+@@ -549,11 +549,12 @@ KCalCore::Alarm::List ETMCalendar::alarms(const QDateTime &from,
+     while (i.hasNext()) {
+         const Akonadi::Item item = i.next().value();
+ 
++        Akonadi::Collection parentCollection; // must have same lifetime as blockedAttr
+         BlockAlarmsAttribute *blockedAttr = nullptr;
+ 
+         if (excludeBlockedAlarms) {
+             // take the collection from m_collectionMap, because we need the up-to-date collection attrs
+-            Akonadi::Collection parentCollection = d->mCollectionMap.value(item.storageCollectionId());
++            parentCollection = d->mCollectionMap.value(item.storageCollectionId());
+             if (parentCollection.isValid() && parentCollection.hasAttribute<BlockAlarmsAttribute>()) {
+                 blockedAttr = parentCollection.attribute<BlockAlarmsAttribute>();
+                 if (blockedAttr->isEverythingBlocked()) {
+-- 
+cgit v1.1