diff --git a/Fix-SQLite-DB-schema-upgrade.patch b/Fix-SQLite-DB-schema-upgrade.patch deleted file mode 100644 index b730f9a..0000000 --- a/Fix-SQLite-DB-schema-upgrade.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2fcd7c4c4f6cc512de9d7778ab67d637934e7638 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -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 PartTable SET storage = external; -- ALTER TABLE PartTable DROP COLUMN external; -+ ALTER TABLE PartTable DROP COLUMN external; -+ - UPDATE PartTable SET storage = cast(external as integer); - ALTER TABLE PartTable DROP COLUMN external; - --- -cgit v0.11.2 - diff --git a/akonadi-17.08.0.tar.xz b/akonadi-17.08.0.tar.xz deleted file mode 100644 index 210bd96..0000000 --- a/akonadi-17.08.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7fea93ea49cc82fc25ad36b1bcfd45d5102c841d5cbdfdb598f854df71bb202 -size 1426892 diff --git a/akonadi-17.08.1.tar.xz b/akonadi-17.08.1.tar.xz new file mode 100644 index 0000000..f0ed5ba --- /dev/null +++ b/akonadi-17.08.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcdc0b6069df48f3cc8e0a9e008e042c7173b2ed340103b7820bc517ef8312da +size 1427180 diff --git a/akonadi-server.changes b/akonadi-server.changes index 783d55d..35bcd86 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Sep 07 07:01:08 CEST 2017 - lbeltrame@kde.org + +- Update to 17.08.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.08.1.php +- Changes since 17.08.0: + * Workaround a weird misbehaviour of SQLite when checking tag RID + * TAGAPPEND: wrap the Tag creation into a db transaction + * Correctly report whether tag changed with SQLite + * Fix typos of "orphan" + * Fix replaying queries from aborted transactions + * Fix job tracker instance support + * Fix SQLite DB schema upgrade to version 35 (kde#384024) + * Add needed columns to QueryBuilder explicitly + * ETM: consider collections that don't match mimetype filter populated +- Dropped patches, now usptream: + * consider-collections-that-not-match-mimetype.patch + * Fix-SQLite-DB-schema-upgrade.patch + ------------------------------------------------------------------- Thu Aug 31 10:02:46 UTC 2017 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index b49eca7..c323976 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -20,7 +20,7 @@ %define rname akonadi Name: akonadi-server -Version: 17.08.0 +Version: 17.08.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) @@ -31,10 +31,6 @@ Group: System/GUI/KDE 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 @@ -176,8 +172,6 @@ service. %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} diff --git a/consider-collections-that-not-match-mimetype.patch b/consider-collections-that-not-match-mimetype.patch deleted file mode 100644 index cfca686..0000000 --- a/consider-collections-that-not-match-mimetype.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d3c6ba904798768b0c83c2e182c27b1c624f78ca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -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 -