Accepting request 534631 from KDE:Applications
KDE Applications 17.08.2 OBS-URL: https://build.opensuse.org/request/show/534631 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=35
This commit is contained in:
commit
00c01d4629
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:dcdc0b6069df48f3cc8e0a9e008e042c7173b2ed340103b7820bc517ef8312da
|
|
||||||
size 1427180
|
|
3
akonadi-17.08.2.tar.xz
Normal file
3
akonadi-17.08.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:85509bfb47f29e05b7985d72be633b7dab38dbaf49a3aab1eee6b9b88762a9b1
|
||||||
|
size 1427700
|
@ -1,3 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 17 00:31:04 CEST 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Update to 17.08.2
|
||||||
|
* New bugfix release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/announce-applications-17.08.2.php
|
||||||
|
- Changes since 17.08.1:
|
||||||
|
* Fix cancelTask() for retrieveItems()
|
||||||
|
* akonadictl: fsck and vacuum require running Akonadi (kde#361542)
|
||||||
|
* Introduce MimeTypeChecker::hasWantedMimeTypes
|
||||||
|
* Only remove init connections to the database on server shutdown.
|
||||||
|
* LIST: correctly return mimetypes for all Collections (kde#350219)
|
||||||
|
- Drop patches, now upstream:
|
||||||
|
* correctly-return-mimetypes.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 8 21:17:15 UTC 2017 - lbeltrame@kde.org
|
Fri Sep 8 21:17:15 UTC 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
%define rname akonadi
|
%define rname akonadi
|
||||||
Name: akonadi-server
|
Name: akonadi-server
|
||||||
Version: 17.08.1
|
Version: 17.08.2
|
||||||
Release: 0
|
Release: 0
|
||||||
%define kf5_version 5.26.0
|
%define kf5_version 5.26.0
|
||||||
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
||||||
@ -31,7 +31,6 @@ Group: System/GUI/KDE
|
|||||||
Url: http://akonadi-project.org
|
Url: http://akonadi-project.org
|
||||||
Source: %{rname}-%{version}.tar.xz
|
Source: %{rname}-%{version}.tar.xz
|
||||||
Source99: akonadi-server-rpmlintrc
|
Source99: akonadi-server-rpmlintrc
|
||||||
Patch0: correctly-return-mimetypes.patch
|
|
||||||
%if 0%{?suse_version} > 1325
|
%if 0%{?suse_version} > 1325
|
||||||
BuildRequires: libboost_headers-devel
|
BuildRequires: libboost_headers-devel
|
||||||
%else
|
%else
|
||||||
@ -173,7 +172,6 @@ service.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{rname}-%{version}
|
%setup -q -n %{rname}-%{version}
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir}
|
%cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir}
|
||||||
|
@ -1,36 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user