From 26be9d995aef05cb517562831c55fa02c8f6c328dabb34bdbaa20e14b3e5a4df Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 12 Oct 2020 07:12:18 +0000 Subject: [PATCH] Accepting request 841151 from home:cgiboudeaux:branches:KDE:Applications - Add patch to fix reloading of external calendar files (kde#427358) * 0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch OBS-URL: https://build.opensuse.org/request/show/841151 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=253 --- ...di_ical_resource-stuck-in-InvalideCa.patch | 32 +++++++++++++++++++ akonadi-server.changes | 6 ++++ akonadi-server.spec | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch diff --git a/0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch b/0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch new file mode 100644 index 0000000..77f2e8d --- /dev/null +++ b/0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch @@ -0,0 +1,32 @@ +From b2e4ee76d5831df075349a5a597c371a4d9c1460 Mon Sep 17 00:00:00 2001 +From: Laurent Montel +Date: Sun, 11 Oct 2020 19:43:58 +0200 +Subject: [PATCH] Bug 427358 - akonadi_ical_resource stuck in + InvalideCacheForCollection + +Readd code removed. +Thanks for Markus for debugging it + +BUG: 427358 +FIXED-IN: 5.15.3 +--- + src/agentbase/resourcebase.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/agentbase/resourcebase.cpp b/src/agentbase/resourcebase.cpp +index 0aa276b21..093b69f74 100644 +--- a/src/agentbase/resourcebase.cpp ++++ b/src/agentbase/resourcebase.cpp +@@ -668,7 +668,8 @@ void ResourceBasePrivate::slotCollectionDeletionDone(KJob *job) + void ResourceBasePrivate::slotInvalidateCache(const Akonadi::Collection &collection) + { + Q_Q(ResourceBase); +- new InvalidateCacheJob(collection, q); ++ InvalidateCacheJob *job = new InvalidateCacheJob(collection, q); ++ connect(job, &KJob::result, scheduler, &ResourceScheduler::taskDone); + } + + void ResourceBase::changeCommitted(const Item &item) +-- +2.28.0 + diff --git a/akonadi-server.changes b/akonadi-server.changes index 377414c..70689f5 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 12 07:01:33 UTC 2020 - Christophe Giboudeaux + +- Add patch to fix reloading of external calendar files (kde#427358) + * 0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch + ------------------------------------------------------------------- Fri Oct 9 05:42:40 UTC 2020 - Luca Beltrame diff --git a/akonadi-server.spec b/akonadi-server.spec index cc0d9bc..734e620 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -30,6 +30,8 @@ Group: System/GUI/KDE URL: https://akonadi-project.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch0: 0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel