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

- Add upstream consider-collections-that-not-match-mimetype.patch:

Browse Source 
* Fixes Korganizer reminders not showing up

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=123
This commit is contained in:
Luca Beltrame 2017-08-31 10:03:29 +00:00 committed by Git OBS Bridge
parent dd88fdbbed
commit 8cfb848ee7
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
akonadi-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 31 10:02:46 UTC 2017 - lbeltrame@kde.org
- Add upstream consider-collections-that-not-match-mimetype.patch:
* Fixes Korganizer reminders not showing up
-------------------------------------------------------------------
Sat Aug 26 10:25:05 UTC 2017 - wbauer@tmo.at

7
akonadi-server.spec
View File

@ -32,7 +32,9 @@ Url: http://akonadi-project.org
Source: %{rname}-%{version}.tar.xz
Source99: akonadi-server-rpmlintrc
# PATCH-FIX-UPSTREAM
Patch: Fix-SQLite-DB-schema-upgrade.patch
Patch0: Fix-SQLite-DB-schema-upgrade.patch
# PATCH-FIX-UPSTREAM
Patch1: consider-collections-that-not-match-mimetype.patch
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
%else
@ -174,7 +176,8 @@ service.
%prep
%setup -q -n %{rname}-%{version}
%patch -p1
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir}

35
consider-collections-that-not-match-mimetype.patch Normal file
View File

@ -0,0 +1,35 @@
From d3c6ba904798768b0c83c2e182c27b1c624f78ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Tue, 15 Aug 2017 12:16:48 +0200
Subject: ETM: consider collections that don't match mimetype filter populated
After commit 0741892fe the ETM only runs ItemFetchJob for collections
that match the current mimetype filter. This caused collections that
don't match the filter (like top-level collections) to never be marked
as populated, breaking applications like korgac that check the
IsPopulatedRole of all collections in the tree.
---
src/core/models/entitytreemodel_p.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/core/models/entitytreemodel_p.cpp b/src/core/models/entitytreemodel_p.cpp
index 94c080b..879ba57 100644
--- a/src/core/models/entitytreemodel_p.cpp
+++ b/src/core/models/entitytreemodel_p.cpp
@@ -473,6 +473,13 @@ void EntityTreeModelPrivate::collectionsFetched(const Akonadi::Collection::List
const auto col = m_collections.value(collectionId);
if (m_mimeChecker.wantedMimeTypes().isEmpty() || m_mimeChecker.isWantedCollection(col)) {
fetchItems(m_collections.value(collectionId));
+ } else {
+ // Consider collections that don't contain relevant mimetypes to be populated
+ m_populatedCols.insert(collectionId);
+ Q_EMIT q_ptr->collectionPopulated(collectionId);
+ const auto idx = indexForCollection(Collection(collectionId));
+ Q_ASSERT(idx.isValid());
+ dataChanged(idx, idx);
}
}
}
--
cgit v0.11.2