From 1b86ec7e8c430db48f0a7f2ec7e5a036b1e9e0cbe91f61e32ba5bce92c434907 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 7 Jun 2017 19:17:51 +0000 Subject: [PATCH 1/2] KDE Applications 17.04.2 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=110 --- akonadi-17.04.1.tar.xz | 3 --- akonadi-17.04.2.tar.xz | 3 +++ akonadi-server.changes | 10 ++++++++++ akonadi-server.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 akonadi-17.04.1.tar.xz create mode 100644 akonadi-17.04.2.tar.xz diff --git a/akonadi-17.04.1.tar.xz b/akonadi-17.04.1.tar.xz deleted file mode 100644 index 1d1a1ca..0000000 --- a/akonadi-17.04.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d247dbdc433e2d589191659c40e85bf7b9c51d6b6a4f8259cea3f13c005b5d37 -size 1301584 diff --git a/akonadi-17.04.2.tar.xz b/akonadi-17.04.2.tar.xz new file mode 100644 index 0000000..9732704 --- /dev/null +++ b/akonadi-17.04.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd10074e2791e80dd01b51e79ab033bfe552e2d82ed034d8d0c30fe7b2ef6321 +size 1302756 diff --git a/akonadi-server.changes b/akonadi-server.changes index 6a51a2c..c83ae4e 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jun 07 17:42:39 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.2.php +- Changes since 17.04.1: + * Fix crash when Connection is terminated before init() (kde#379809) + ------------------------------------------------------------------- Wed May 17 20:35:29 CEST 2017 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 2dc1ab7..57d1690 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -20,7 +20,7 @@ %define rname akonadi Name: akonadi-server -Version: 17.04.1 +Version: 17.04.2 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From f266fbe420686c8e3400d7c5ffe1d017aba50028325fefb159dce52929f686f5 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 11 Jun 2017 20:31:20 +0000 Subject: [PATCH 2/2] - Add upstream patch pass-source-collection-to-move-mails.diff * Fix mails not being removed from list when deleted (kde#380182) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=111 --- akonadi-server.changes | 6 ++ akonadi-server.spec | 3 + pass-source-collection-to-move-mails.diff | 68 +++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 pass-source-collection-to-move-mails.diff diff --git a/akonadi-server.changes b/akonadi-server.changes index c83ae4e..4ed7579 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 11 20:30:22 UTC 2017 - lbeltrame@kde.org + +- Add upstream patch pass-source-collection-to-move-mails.diff + * Fix mails not being removed from list when deleted (kde#380182) + ------------------------------------------------------------------- Wed Jun 07 17:42:39 CEST 2017 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 57d1690..a75e6b4 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -31,6 +31,8 @@ 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 @@ -170,6 +172,7 @@ 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} diff --git a/pass-source-collection-to-move-mails.diff b/pass-source-collection-to-move-mails.diff new file mode 100644 index 0000000..e2f6b7d --- /dev/null +++ b/pass-source-collection-to-move-mails.diff @@ -0,0 +1,68 @@ +From 2dc7fbf569ba3f7eeef98fb818d7af0820caf7a3 Mon Sep 17 00:00:00 2001 +From: Martin Koller +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 &); + void monitoredItemMoved(const Akonadi::Item &item, const Akonadi::Collection &, const Akonadi::Collection &); + +-- +cgit v0.11.2 +