Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2021-02-07 15:14:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Sun Feb 7 15:14:35 2021 rev:79 rq:869243 version:20.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2021-01-08 17:34:40.933006052 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new.28504/akonadi-server.changes 2021-02-07 15:14:46.589435038 +0100 @@ -1,0 +2,18 @@ +Wed Feb 3 08:27:34 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 20.12.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2021-02-apps-update +- Changes since 20.12.1: + * Fix Bug 432307 - Cancel drag'n drop does not work (kde#432307) + * Add autotest for Item::setTags when creating instances + * When tags are overwriien, get them from tags() + * Remove unsused method in Config + * Use lazy global initialization of Config singleton + * Fix bug when deleting the last tag (kde#431297) + * Fix Bug 430787 - When moving an email into a subfolder + on KDE Plasma Wayland the context menu does not appear + at the target subfolder (kde#430787) + +------------------------------------------------------------------- Old: ---- akonadi-20.12.1.tar.xz akonadi-20.12.1.tar.xz.sig New: ---- akonadi-20.12.2.tar.xz akonadi-20.12.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.GscpKk/_old 2021-02-07 15:14:47.469435979 +0100 +++ /var/tmp/diff_new_pack.GscpKk/_new 2021-02-07 15:14:47.473435983 +0100 @@ -22,7 +22,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 20.12.1 +Version: 20.12.2 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later ++++++ akonadi-20.12.1.tar.xz -> akonadi-20.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/CMakeLists.txt new/akonadi-20.12.2/CMakeLists.txt --- old/akonadi-20.12.1/CMakeLists.txt 2021-01-05 02:23:11.000000000 +0100 +++ new/akonadi-20.12.2/CMakeLists.txt 2021-02-02 01:50:28.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.16.1") +set(PIM_VERSION "5.16.2") project(Akonadi VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 17) @@ -37,7 +37,7 @@ include(AkonadiMacros) set(QT_REQUIRED_VERSION "5.13.0") -set(RELEASE_SERVICE_VERSION "20.12.0") +set(RELEASE_SERVICE_VERSION "20.12.2") set(AKONADI_FULL_VERSION "${PIM_VERSION} (${RELEASE_SERVICE_VERSION})") configure_file(akonadifull-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadifull-version.h @ONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/autotests/libs/tagtest.cpp new/akonadi-20.12.2/autotests/libs/tagtest.cpp --- old/akonadi-20.12.1/autotests/libs/tagtest.cpp 2020-12-23 09:37:02.000000000 +0100 +++ new/akonadi-20.12.2/autotests/libs/tagtest.cpp 2021-02-01 00:20:27.000000000 +0100 @@ -43,6 +43,7 @@ void testAttributes(); void testTagItem(); void testCreateItem(); + void testCreateItemWithTags(); void testRIDIsolation(); void testFetchTagIdWithItem(); void testFetchFullTagWithItem(); @@ -556,6 +557,48 @@ AKVERIFYEXEC(deleteJob); } +void TagTest::testCreateItemWithTags() +{ + const Collection res3 = Collection(AkonadiTest::collectionIdFromPath(QStringLiteral("res3"))); + Tag tag1; + { + TagCreateJob *createjob = new TagCreateJob(Tag(QStringLiteral("gid1")), this); + AKVERIFYEXEC(createjob); + tag1 = createjob->tag(); + } + Tag tag2; + { + TagCreateJob *createjob = new TagCreateJob(Tag(QStringLiteral("gid2")), this); + AKVERIFYEXEC(createjob); + tag2 = createjob->tag(); + } + + Item item1; + { + item1.setMimeType(QStringLiteral("application/octet-stream")); + item1.setTags({tag1, tag2}); + auto *append = new ItemCreateJob(item1, res3, this); + AKVERIFYEXEC(append); + item1 = append->item(); + } + + auto *fetchJob = new ItemFetchJob(item1, this); + fetchJob->fetchScope().setFetchTags(true); + AKVERIFYEXEC(fetchJob); + auto fetchTags = fetchJob->items().first().tags(); + + std::unique_ptr<TagDeleteJob, void (*)(TagDeleteJob *)> finally( + new TagDeleteJob({tag1, tag2}, this), + [] (TagDeleteJob *j) + { + j->exec(); + delete j; + }); + QCOMPARE(fetchTags.size(), 2); + QVERIFY(fetchTags.contains(tag1)); + QVERIFY(fetchTags.contains(tag2)); +} + void TagTest::testFetchTagIdWithItem() { const Collection res3 = Collection(AkonadiTest::collectionIdFromPath(QStringLiteral("res3"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/po/ca/libakonadi5.po new/akonadi-20.12.2/po/ca/libakonadi5.po --- old/akonadi-20.12.1/po/ca/libakonadi5.po 2021-01-05 02:23:10.000000000 +0100 +++ new/akonadi-20.12.2/po/ca/libakonadi5.po 2021-02-02 01:50:27.000000000 +0100 @@ -1,24 +1,24 @@ # Translation of libakonadi5.po to Catalan -# Copyright (C) 2007-2020 This_file_is_part_of_KDE +# Copyright (C) 2007-2021 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. # Manuel Tortosa Moreno <[email protected]>, 2009, 2010. -# Antoni Bella P??rez <[email protected]>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. +# Antoni Bella P??rez <[email protected]>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: akonadi\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-11-12 08:28+0100\n" -"PO-Revision-Date: 2020-08-04 16:46+0200\n" +"PO-Revision-Date: 2021-01-25 10:05+0100\n" "Last-Translator: Antoni Bella P??rez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.04.3\n" +"X-Generator: Lokalize 20.12.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -218,7 +218,7 @@ #: core/jobs/resourcesynchronizationjob.cpp:118 #, kde-format msgid "Unable to obtain D-Bus interface for resource '%1'" -msgstr "No s'ha pogut obtenir la interf??cie de D-Bus pel recurs ??%1??" +msgstr "No s'ha pogut obtenir la interf??cie de D-Bus per al recurs ??%1??" #: core/jobs/collectionattributessynchronizationjob.cpp:128 #, kde-format @@ -1033,7 +1033,7 @@ "que es pugui llen??ar alguna versi??, els haureu d'integrar manualment.<br>Feu " "clic a ??<a href=\"opentexteditor\">Obre l'editor de text</a>?? per a mantenir " "una c??pia dels textos, seleccioneu la versi?? m??s correcta, torneu-la a obrir " -"i modifiqueu-la de nou per afegir-hi el que falta." +"i modifiqueu-la de nou per a afegir-hi el que falta." #: widgets/conflictresolvedialog.cpp:256 #, kde-format @@ -1112,7 +1112,7 @@ msgstr "" "El servei per a la gesti?? de la informaci?? personal est?? efectuant una " "actualitzaci?? de la base de dades. Aix?? succeeix despr??s d'una actualitzaci?? " -"del programari i, ??s necessari per optimitzar el rendiment.\n" +"del programari i, ??s necessari per a optimitzar el rendiment.\n" "En funci?? de la quantitat d'informaci?? personal, aix?? pot trigar alguns " "minuts." @@ -1143,7 +1143,7 @@ msgstr "" "El marc de treball per a la gesti?? de la informaci?? personal Akonadi no es " "troba operatiu.\n" -"Feu clic a ??Detalls...?? per obtenir informaci?? detallada quant a aquest " +"Feu clic a ??Detalls...?? per a obtenir informaci?? detallada quant a aquest " "problema." #. i18n: ectx: property (text), widget (QLabel, brokenDescription) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/po/ca@valencia/libakonadi5.po new/akonadi-20.12.2/po/ca@valencia/libakonadi5.po --- old/akonadi-20.12.1/po/ca@valencia/libakonadi5.po 2021-01-05 02:23:10.000000000 +0100 +++ new/akonadi-20.12.2/po/ca@valencia/libakonadi5.po 2021-02-02 01:50:27.000000000 +0100 @@ -1,24 +1,24 @@ # Translation of libakonadi5.po to Catalan (Valencian) -# Copyright (C) 2007-2020 This_file_is_part_of_KDE +# Copyright (C) 2007-2021 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. # Manuel Tortosa Moreno <[email protected]>, 2009, 2010. -# Antoni Bella P??rez <[email protected]>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. +# Antoni Bella P??rez <[email protected]>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: akonadi\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-11-12 08:28+0100\n" -"PO-Revision-Date: 2020-08-04 16:46+0200\n" +"PO-Revision-Date: 2021-01-25 10:05+0100\n" "Last-Translator: Antoni Bella P??rez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.04.3\n" +"X-Generator: Lokalize 20.12.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -218,7 +218,7 @@ #: core/jobs/resourcesynchronizationjob.cpp:118 #, kde-format msgid "Unable to obtain D-Bus interface for resource '%1'" -msgstr "No s'ha pogut obtindre la interf??cie de D-Bus pel recurs ??%1??" +msgstr "No s'ha pogut obtindre la interf??cie de D-Bus per al recurs ??%1??" #: core/jobs/collectionattributessynchronizationjob.cpp:128 #, kde-format @@ -1033,7 +1033,7 @@ "que es puga llen??ar alguna versi??, els haureu d'integrar manualment.<br>Feu " "clic a ??<a href=\"opentexteditor\">Obri l'editor de text</a>?? per a " "mantindre una c??pia dels textos, seleccioneu la versi?? m??s correcta, torneu-" -"la a obrir i modifiqueu-la de nou per afegir-hi el que falta." +"la a obrir i modifiqueu-la de nou per a afegir-hi el que falta." #: widgets/conflictresolvedialog.cpp:256 #, kde-format @@ -1112,7 +1112,7 @@ msgstr "" "El servei per a la gesti?? de la informaci?? personal est?? efectuant una " "actualitzaci?? de la base de dades. Aix?? succeeix despr??s d'una actualitzaci?? " -"del programari i, ??s necessari per optimitzar el rendiment.\n" +"del programari i, ??s necessari per a optimitzar el rendiment.\n" "En funci?? de la quantitat d'informaci?? personal, aix?? pot trigar alguns " "minuts." @@ -1143,7 +1143,7 @@ msgstr "" "El marc de treball per a la gesti?? de la informaci?? personal Akonadi no es " "troba operatiu.\n" -"Feu clic a ??Detalls...?? per obtindre informaci?? detallada quant a aquest " +"Feu clic a ??Detalls...?? per a obtindre informaci?? detallada quant a aquest " "problema." #. i18n: ectx: property (text), widget (QLabel, brokenDescription) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/po/zh_CN/akonadi_knut_resource.po new/akonadi-20.12.2/po/zh_CN/akonadi_knut_resource.po --- old/akonadi-20.12.1/po/zh_CN/akonadi_knut_resource.po 2021-01-05 02:23:11.000000000 +0100 +++ new/akonadi-20.12.2/po/zh_CN/akonadi_knut_resource.po 2021-02-02 01:50:28.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-10-23 02:27+0200\n" -"PO-Revision-Date: 2021-01-03 09:06\n" +"PO-Revision-Date: 2021-01-28 05:08\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/po/zh_CN/libakonadi5.po new/akonadi-20.12.2/po/zh_CN/libakonadi5.po --- old/akonadi-20.12.1/po/zh_CN/libakonadi5.po 2021-01-05 02:23:11.000000000 +0100 +++ new/akonadi-20.12.2/po/zh_CN/libakonadi5.po 2021-02-02 01:50:28.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-11-12 08:28+0100\n" -"PO-Revision-Date: 2021-01-03 09:06\n" +"PO-Revision-Date: 2021-01-28 05:08\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/src/core/config.cpp new/akonadi-20.12.2/src/core/config.cpp --- old/akonadi-20.12.1/src/core/config.cpp 2020-12-23 09:37:02.000000000 +0100 +++ new/akonadi-20.12.2/src/core/config.cpp 2021-02-01 00:20:27.000000000 +0100 @@ -11,7 +11,7 @@ using namespace Akonadi; -Config Config::sConfig{}; +Q_GLOBAL_STATIC(Config, sConfig) // NOLINT(readability-redundant-member-init) namespace { @@ -44,7 +44,7 @@ } } -void Config::setConfig(const Config &config) +const Config &Config::get() { - sConfig = config; + return *sConfig; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/src/core/config_p.h new/akonadi-20.12.2/src/core/config_p.h --- old/akonadi-20.12.1/src/core/config_p.h 2020-12-23 09:37:02.000000000 +0100 +++ new/akonadi-20.12.2/src/core/config_p.h 2021-02-01 00:20:27.000000000 +0100 @@ -14,12 +14,10 @@ class Config { public: + explicit Config(); ~Config() = default; - static const Config &get() - { - return sConfig; - } + static const Config &get(); struct PayloadCompression { /** @@ -36,15 +34,6 @@ * Configures behavior of the payload compression feature. */ PayloadCompression payloadCompression = {}; - - -protected: - explicit Config(); - - static void setConfig(const Config &config); - -private: - static Config sConfig; }; } // namespace Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/src/core/jobs/itemcreatejob.cpp new/akonadi-20.12.2/src/core/jobs/itemcreatejob.cpp --- old/akonadi-20.12.1/src/core/jobs/itemcreatejob.cpp 2020-12-23 09:37:02.000000000 +0100 +++ new/akonadi-20.12.2/src/core/jobs/itemcreatejob.cpp 2021-02-01 00:20:27.000000000 +0100 @@ -134,19 +134,23 @@ cmd->setFlags(d->mItem.flags()); cmd->setFlagsOverwritten(d->mItem.d_ptr->mFlagsOverwritten); } else { - auto addedFlags = ItemChangeLog::instance()->addedFlags(d->mItem.d_ptr); - auto deletedFlags = ItemChangeLog::instance()->deletedFlags(d->mItem.d_ptr); + const auto addedFlags = ItemChangeLog::instance()->addedFlags(d->mItem.d_ptr); + const auto deletedFlags = ItemChangeLog::instance()->deletedFlags(d->mItem.d_ptr); cmd->setAddedFlags(addedFlags); cmd->setRemovedFlags(deletedFlags); } - auto addedTags = ItemChangeLog::instance()->addedTags(d->mItem.d_ptr); - auto deletedTags = ItemChangeLog::instance()->deletedTags(d->mItem.d_ptr); - if (!addedTags.isEmpty() && (d->mItem.d_ptr->mTagsOverwritten || !merge)) { - cmd->setTags(ProtocolHelper::entitySetToScope(addedTags)); + + if (d->mItem.d_ptr->mTagsOverwritten || !merge) { + const auto tags = d->mItem.tags(); + if (!tags.isEmpty()) { + cmd->setTags(ProtocolHelper::entitySetToScope(tags)); + } } else { + const auto addedTags = ItemChangeLog::instance()->addedTags(d->mItem.d_ptr); if (!addedTags.isEmpty()) { cmd->setAddedTags(ProtocolHelper::entitySetToScope(addedTags)); } + const auto deletedTags = ItemChangeLog::instance()->deletedTags(d->mItem.d_ptr); if (!deletedTags.isEmpty()) { cmd->setRemovedTags(ProtocolHelper::entitySetToScope(deletedTags)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/src/core/jobs/itemmodifyjob.cpp new/akonadi-20.12.2/src/core/jobs/itemmodifyjob.cpp --- old/akonadi-20.12.1/src/core/jobs/itemmodifyjob.cpp 2020-12-23 09:37:02.000000000 +0100 +++ new/akonadi-20.12.2/src/core/jobs/itemmodifyjob.cpp 2021-02-01 00:20:27.000000000 +0100 @@ -187,7 +187,10 @@ } if (item.d_ptr->mTagsOverwritten) { - cmd->setTags(ProtocolHelper::entitySetToScope(item.tags())); + const auto tags = item.tags(); + if (!tags.isEmpty()) { + cmd->setTags(ProtocolHelper::entitySetToScope(tags)); + } } else { const auto addedTags = ItemChangeLog::instance()->addedTags(item.d_ptr); if (!addedTags.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-20.12.1/src/widgets/dragdropmanager.cpp new/akonadi-20.12.2/src/widgets/dragdropmanager.cpp --- old/akonadi-20.12.1/src/widgets/dragdropmanager.cpp 2020-12-23 09:37:02.000000000 +0100 +++ new/akonadi-20.12.2/src/widgets/dragdropmanager.cpp 2021-02-01 00:20:27.000000000 +0100 @@ -228,18 +228,18 @@ } popup.addSeparator(); - popup.addAction(QIcon::fromTheme(QStringLiteral("process-stop")), i18n("C&ancel") + QLatin1Char('\t') + QKeySequence(Qt::Key_Escape).toString()); + QAction *cancelAction = popup.addAction(QIcon::fromTheme(QStringLiteral("process-stop")), i18n("C&ancel") + QLatin1Char('\t') + QKeySequence(Qt::Key_Escape).toString()); - QAction *activatedAction = popup.exec(QCursor::pos()); - if (activatedAction == moveDropAction) { + QAction *activatedAction = popup.exec(m_view->mapToGlobal(event->pos())); + if (!activatedAction || (activatedAction == cancelAction)) { + menuCanceled = true; + return false; + } else if (activatedAction == moveDropAction) { event->setDropAction(Qt::MoveAction); } else if (activatedAction == copyDropAction) { event->setDropAction(Qt::CopyAction); } else if (activatedAction == linkAction) { event->setDropAction(Qt::LinkAction); - } else { - menuCanceled = true; - return false; } return true; } ++++++ applications.keyring ++++++ Binary files /var/tmp/diff_new_pack.GscpKk/_old and /var/tmp/diff_new_pack.GscpKk/_new differ
