pool/akonadi-server
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 841151 from home:cgiboudeaux:branches:KDE:Applications

Browse Source 
- 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
This commit is contained in:
Luca Beltrame 2020-10-12 07:12:18 +00:00 committed by Git OBS Bridge
parent 3aa2b62135
commit 26be9d995a
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch Normal file
View File

@ -0,0 +1,32 @@
From b2e4ee76d5831df075349a5a597c371a4d9c1460 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
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

6
akonadi-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 12 07:01:33 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- 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 <lbeltrame@kde.org> Fri Oct 9 05:42:40 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>

2
akonadi-server.spec
View File

@ -30,6 +30,8 @@ Group: System/GUI/KDE
URL: https://akonadi-project.org URL: https://akonadi-project.org
Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
Source99: akonadi-server-rpmlintrc 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: extra-cmake-modules >= %{kf5_version}
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: libQt5Sql-private-headers-devel BuildRequires: libQt5Sql-private-headers-devel