pool/akonadi-server
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 522463 from KDE:Applications

Browse Source 
KDE Applications 17.08.1

OBS-URL: https://build.opensuse.org/request/show/522463
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger
2017-09-12 17:41:18 +00:00
committed by Git OBS Bridge
parent 7f245a7fb3 60f6361bff
commit d6de9a350c
7 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Fix-SQLite-DB-schema-upgrade.patch
View File

@@ -1,33 +0,0 @@
From 2fcd7c4c4f6cc512de9d7778ab67d637934e7638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@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

3
akonadi-17.08.0.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7fea93ea49cc82fc25ad36b1bcfd45d5102c841d5cbdfdb598f854df71bb202
size 1426892

3
akonadi-17.08.1.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dcdc0b6069df48f3cc8e0a9e008e042c7173b2ed340103b7820bc517ef8312da
size 1427180

27
akonadi-server.changes
View File

@@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Sep 8 21:17:15 UTC 2017 - lbeltrame@kde.org
- Add upstream patch correctly-return-mimetypes.patch:
* Fixes creating top-level folders in KMail (kde#350219)
-------------------------------------------------------------------
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

8
akonadi-server.spec
View File

@@ -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,7 @@ 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
Patch0: correctly-return-mimetypes.patch
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
%else
@@ -177,7 +174,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}

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

@@ -1,35 +0,0 @@
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

36
correctly-return-mimetypes.patch Normal file
View File

@@ -0,0 +1,36 @@
From 97a191a5df7b307c70e662996c4846d3d586ff61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Fri, 8 Sep 2017 17:09:54 +0200
Subject: LIST: correctly return mimetypes for all Collections
LIST was only returning mimetypes for Collections that were resolved in the
initial filter pass. All Collections that were resolved in the second pass
to complete the tree were missing mimetypes, because their IDs were not
passed to the mimetype query. This in included mainly Collections that
don't match the initial mimetype filter, like top-level Collections.
This caused, among other things, KMail to refuse to create Collections
under the top-level Collection, because the top-level Collections did
not match KMail's mimetype filter (inode/directory).
BUG: 350219
FIXED-IN: 5.6.2
---
src/server/handler/list.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/server/handler/list.cpp b/src/server/handler/list.cpp
index 2f0584a..bfe8c6b 100644
--- a/src/server/handler/list.cpp
+++ b/src/server/handler/list.cpp
@@ -428,6 +428,7 @@ void List::retrieveCollections(const Collection &topParent, int depth)
mCollections.insert(missingCol.id(), missingCol);
ancestorIds << missingCol.id();
attributeIds << missingCol.id();
+ mimeTypeIds << missingCol.id();
//We have to do another round if the parents parent is missing
if (missingCol.parentId() != parentId && !mCollections.contains(missingCol.parentId())) {
missingCollections.insert(missingCol.parentId());
--
cgit v0.11.2