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

Accepting request 510630 from KDE:Applications

Browse Source 
KDE Applications 17.04.3

OBS-URL: https://build.opensuse.org/request/show/510630
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2017-07-25 09:25:52 +00:00 committed by Git OBS Bridge
commit b97b8769d6
5 changed files with 17 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
akonadi-17.04.2.tar.xz
View File

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

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

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

13
akonadi-server.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sat Jul 15 22:58:50 CEST 2017 - lbeltrame@kde.org
- Update to 17.04.3
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.04.3.php
- Changes since 17.04.2:
* ETM: only populate collections with matching mimetype
* Explicitely pass source collection to ensure moving mails work
- Drop upstreamed patches:
* pass-source-collection-to-move-mails.diff
-------------------------------------------------------------------
Sun Jun 11 20:30:22 UTC 2017 - lbeltrame@kde.org

5
akonadi-server.spec
View File

@ -20,7 +20,7 @@
%define rname akonadi
Name: akonadi-server
Version: 17.04.2
Version: 17.04.3
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
@ -31,8 +31,6 @@ Group: System/GUI/KDE
Url: http://akonadi-project.org
Source: %{rname}-%{version}.tar.xz
Source99: akonadi-server-rpmlintrc
# PATCH-FIX-UPSTREAM
Patch0: pass-source-collection-to-move-mails.diff
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
%else
@ -172,7 +170,6 @@ service.
%prep
%setup -q -n %{rname}-%{version}
%patch0 -p1
%build
%cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir}

68
pass-source-collection-to-move-mails.diff
View File

@ -1,68 +0,0 @@
From 2dc7fbf569ba3f7eeef98fb818d7af0820caf7a3 Mon Sep 17 00:00:00 2001
From: Martin Koller <kollix@aon.at>
Date: Sat, 6 May 2017 11:30:06 +0200
Subject: Explicitely pass source collection to ensure moving mails work
... since the passed item.parentCollection() is already the target
collection
Differential Revision: https://phabricator.kde.org/D5711
(cherry picked from commit 33d86e165c5fe150583f9ac3ab58626ffcfe4f97)
---
src/core/models/entitytreemodel_p.cpp | 9 +++++----
src/core/models/entitytreemodel_p.h | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/core/models/entitytreemodel_p.cpp b/src/core/models/entitytreemodel_p.cpp
index 7c75746..79f0c04 100644
--- a/src/core/models/entitytreemodel_p.cpp
+++ b/src/core/models/entitytreemodel_p.cpp
@@ -1104,7 +1104,7 @@ void EntityTreeModelPrivate::monitoredItemAdded(const Akonadi::Item &item, const
q->endInsertRows();
}
-void EntityTreeModelPrivate::monitoredItemRemoved(const Akonadi::Item &item)
+void EntityTreeModelPrivate::monitoredItemRemoved(const Akonadi::Item &item, const Akonadi::Collection &parentCollection)
{
Q_Q(EntityTreeModel);
@@ -1112,7 +1112,8 @@ void EntityTreeModelPrivate::monitoredItemRemoved(const Akonadi::Item &item)
return;
}
- if ((m_itemPopulation == EntityTreeModel::LazyPopulation) && !m_populatedCols.contains(item.parentCollection().id())) {
+ if ((m_itemPopulation == EntityTreeModel::LazyPopulation) &&
+ !m_populatedCols.contains(parentCollection.isValid() ? parentCollection.id() : item.parentCollection().id())) {
return;
}
@@ -1197,10 +1198,10 @@ void EntityTreeModelPrivate::monitoredItemMoved(const Akonadi::Item &item,
monitoredItemAdded(item, destCollection);
return;
} else if (isHidden(destCollection)) {
- monitoredItemRemoved(item);
+ monitoredItemRemoved(item, sourceCollection);
return;
} else {
- monitoredItemRemoved(item);
+ monitoredItemRemoved(item, sourceCollection);
monitoredItemAdded(item, destCollection);
return;
}
diff --git a/src/core/models/entitytreemodel_p.h b/src/core/models/entitytreemodel_p.h
index 9c5e5ac..1d90abb 100644
--- a/src/core/models/entitytreemodel_p.h
+++ b/src/core/models/entitytreemodel_p.h
@@ -93,7 +93,7 @@ public:
const Akonadi::Collection &destCollection);
void monitoredItemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection);
- void monitoredItemRemoved(const Akonadi::Item &item);
+ void monitoredItemRemoved(const Akonadi::Item &item, const Akonadi::Collection &collection = Akonadi::Collection());
void monitoredItemChanged(const Akonadi::Item &item, const QSet<QByteArray> &);
void monitoredItemMoved(const Akonadi::Item &item, const Akonadi::Collection &, const Akonadi::Collection &);
--
cgit v0.11.2