Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2017-06-12 15:26:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Mon Jun 12 15:26:22 2017 rev:30 rq:502912 version:17.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2017-05-22 10:37:32.936951166 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2017-06-12 15:26:26.215095890 +0200 @@ -1,0 +2,16 @@ +Sun Jun 11 20:30:22 UTC 2017 - lbeltr...@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 - lbeltr...@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) + +------------------------------------------------------------------- Old: ---- akonadi-17.04.1.tar.xz New: ---- akonadi-17.04.2.tar.xz pass-source-collection-to-move-mails.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.JoRm5U/_old 2017-06-12 15:26:26.867003898 +0200 +++ /var/tmp/diff_new_pack.JoRm5U/_new 2017-06-12 15:26:26.871003334 +0200 @@ -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) @@ -31,6 +31,8 @@ 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 @@ %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} ++++++ akonadi-17.04.1.tar.xz -> akonadi-17.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.04.1/CMakeLists.txt new/akonadi-17.04.2/CMakeLists.txt --- old/akonadi-17.04.1/CMakeLists.txt 2017-05-09 02:26:06.000000000 +0200 +++ new/akonadi-17.04.2/CMakeLists.txt 2017-06-06 02:23:19.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.5.1") +set(PIM_VERSION "5.5.2") project(Akonadi VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.04.1/po/tr/libakonadi5.po new/akonadi-17.04.2/po/tr/libakonadi5.po --- old/akonadi-17.04.1/po/tr/libakonadi5.po 2017-05-09 02:26:06.000000000 +0200 +++ new/akonadi-17.04.2/po/tr/libakonadi5.po 2017-06-06 02:23:19.000000000 +0200 @@ -1664,8 +1664,9 @@ "<p>For more troubleshooting tips please refer to <a href=\"http://userbase."; "kde.org/Akonadi\">userbase.kde.org/Akonadi</a>.</p>" msgstr "" -"<p>Sorun giderme ile ilgili daha fazla ipucu için lütfen <a href=\"http://"; -"userbase.kde.org/Akonadi\">userbase.kde.org/Akonadi</a> adresine bakın.</p>" +"<p>Sorun giderme ile ilgili daha fazla ipucu için lütfen <a href=\"" +"http://userbase.kde.org/Akonadi\";>userbase.kde.org/Akonadi</a> adresine " +"bakın.</p>" #: widgets/standardactionmanager.cpp:85 #, kde-format @@ -2014,10 +2015,8 @@ msgid "Do you really want to delete this folder and all its sub-folders?" msgid_plural "" "Do you really want to delete %1 folders and all their sub-folders?" -msgstr[0] "" -"Bu dizini ve tüm alt dizinlerini silmek istediğinizden emin misiniz?" -msgstr[1] "" -"%1 dizini ve tüm alt dizinlerini silmek istediğinizden emin misiniz?" +msgstr[0] "Bu dizini ve tüm alt dizinlerini silmek istediğinizden emin misiniz?" +msgstr[1] "%1 dizini ve tüm alt dizinlerini silmek istediğinizden emin misiniz?" #: widgets/standardactionmanager.cpp:249 #, kde-format @@ -2374,8 +2373,7 @@ #~ "The server Protocol version is %1, which equal or newer than the required " #~ "version %2." #~ msgstr "" -#~ "Sunucu Protokol sürümü %1, gerekli %2 sürümüne denk veya daha yeni bir " -#~ "sürüm." +#~ "Sunucu Protokol sürümü %1, gerekli %2 sürümüne denk veya daha yeni bir sürüm." #~ msgid "Inconsistent local collection tree detected." #~ msgstr "Tutarsız yerel koleksiyon ağacı belirlendi." @@ -2383,8 +2381,7 @@ #~ msgid "" #~ "Remote collection without root-terminated ancestor chain provided, " #~ "resource is broken." -#~ msgstr "" -#~ "Kök-sonlu ata zinciri olmayan uzak koleksiyon verildi, özkaynak kırık." +#~ msgstr "Kök-sonlu ata zinciri olmayan uzak koleksiyon verildi, özkaynak kırık." #~ msgid "KDE Test Program" #~ msgstr "KDE Sınama Programı" @@ -2498,8 +2495,8 @@ #~ "<p style=\"color: white;\"><b>Akonadi not operational.<br/><a href=" #~ "\"details\" style=\"color: white;\">Details...</a></b></p>" #~ msgstr "" -#~ "<p style=\"color: white;\"><b>Akonadi kullanıma hazır değil.<br/><a href=" -#~ "\"details\" style=\"color: white;\">Ayrıntılar...</a></b></p>" +#~ "<p style=\"color: white;\"><b>Akonadi kullanıma hazır değil.<br/><a href=\"" +#~ "details\" style=\"color: white;\">Ayrıntılar...</a></b></p>" #~ msgctxt "@title, application description" #~ msgid "Akonadi Resource" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.04.1/src/server/connection.cpp new/akonadi-17.04.2/src/server/connection.cpp --- old/akonadi-17.04.1/src/server/connection.cpp 2017-04-28 21:28:35.000000000 +0200 +++ new/akonadi-17.04.2/src/server/connection.cpp 2017-05-20 09:33:39.000000000 +0200 @@ -125,7 +125,9 @@ delete m_socket; m_socket = nullptr; - m_idleTimer->stop(); + if (m_idleTimer) { + m_idleTimer->stop(); + } delete m_idleTimer; AkThread::quit(); ++++++ pass-source-collection-to-move-mails.diff ++++++ >From 2dc7fbf569ba3f7eeef98fb818d7af0820caf7a3 Mon Sep 17 00:00:00 2001 From: Martin Koller <kol...@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
