Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2017-09-04 12:27:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Mon Sep 4 12:27:50 2017 rev:33 rq:519895 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2017-08-24 17:41:48.325941353 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2017-09-04 12:27:52.850727487 +0200 @@ -1,0 +2,13 @@ +Thu Aug 31 10:02:46 UTC 2017 - lbeltr...@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 - wba...@tmo.at + +- Add Fix-SQLite-DB-schema-upgrade.patch to fix Akonadi not + starting when the sqlite plugin is used because the database + schema upgrade fails due to unsupported syntax (kde#384024) + +------------------------------------------------------------------- New: ---- Fix-SQLite-DB-schema-upgrade.patch consider-collections-that-not-match-mimetype.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.hPX2Oz/_old 2017-09-04 12:27:53.806593097 +0200 +++ /var/tmp/diff_new_pack.hPX2Oz/_new 2017-09-04 12:27:53.814591972 +0200 @@ -31,6 +31,10 @@ Url: http://akonadi-project.org Source: %{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc +# PATCH-FIX-UPSTREAM +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 @@ -172,6 +176,8 @@ %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} ++++++ Fix-SQLite-DB-schema-upgrade.patch ++++++ >From 2fcd7c4c4f6cc512de9d7778ab67d637934e7638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvra...@kde.org> Date: Sat, 26 Aug 2017 12:03:40 +0200 Subject: Fix SQLite DB schema upgrade to version 35 SQLite does not support DROP COLUMN and our upgrade language is not expressive enough to handle that in another way, so for now we just leave the 'external' column in PartTable on SQLite, it will simply be ignored. On other backends the column is removed as expected. BUG: 384024 FIXED-IN: 5.6.1 --- src/server/storage/dbupdate.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/storage/dbupdate.xml b/src/server/storage/dbupdate.xml index 80fb9d7..c5f9777 100644 --- a/src/server/storage/dbupdate.xml +++ b/src/server/storage/dbupdate.xml @@ -323,7 +323,8 @@ <update version="35" abortOnFailure="true"> <raw-sql backends="mysql,sqlite">UPDATE PartTable SET storage = external;</raw-sql> - <raw-sql backends="mysql,sqlite">ALTER TABLE PartTable DROP COLUMN external;</raw-sql> + <raw-sql backends="mysql">ALTER TABLE PartTable DROP COLUMN external;</raw-sql> + <!-- TODO: SQLITE: drop the column as well, but SQLite does not have DROP COLUMN //--> <raw-sql backends="psql">UPDATE PartTable SET storage = cast(external as integer);</raw-sql> <raw-sql backends="psql">ALTER TABLE PartTable DROP COLUMN external;</raw-sql> </update> -- cgit v0.11.2 ++++++ consider-collections-that-not-match-mimetype.patch ++++++ >From d3c6ba904798768b0c83c2e182c27b1c624f78ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvra...@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
