Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2017-02-13 07:03:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2017-02-08 10:45:39.483714705 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2017-02-13 07:03:33.545856194 +0100 @@ -1,0 +2,8 @@ +Thu Feb 9 06:38:57 UTC 2017 - [email protected] + +- Update to KDE Applications 16.12.2 + * KDE Applications 16.12.2 + * https://www.kde.org/announcements/announce-applications-16.12.2.php + + +------------------------------------------------------------------- Old: ---- akonadi-16.12.1.tar.xz New: ---- akonadi-16.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.ryVhXS/_old 2017-02-13 07:03:34.981650990 +0100 +++ /var/tmp/diff_new_pack.ryVhXS/_new 2017-02-13 07:03:34.985650418 +0100 @@ -18,10 +18,10 @@ %define rname akonadi %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.2 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Name: akonadi-server -Version: 16.12.1 +Version: 16.12.2 Release: 0 Summary: PIM Storage Service License: LGPL-2.1+ @@ -142,7 +142,7 @@ Summary: Akonadi Framework: Build Environment Group: Development/Libraries/X11 Requires: %{name} = %{version} -%if 0%{?suse_version} > 1315 +%if 0%{?suse_version} > 1325 Requires: libboost_headers-devel %else Requires: boost-devel ++++++ akonadi-16.12.1.tar.xz -> akonadi-16.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/CMakeLists.txt new/akonadi-16.12.2/CMakeLists.txt --- old/akonadi-16.12.1/CMakeLists.txt 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/CMakeLists.txt 2017-01-19 13:12:42.000000000 +0100 @@ -22,7 +22,7 @@ include(AkonadiMacros) -set(PIM_VERSION "5.4.1") +set(PIM_VERSION "5.4.2") set(QT_REQUIRED_VERSION "5.6.0") set(AKONADI_VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/akonadicontrol/CMakeLists.txt new/akonadi-16.12.2/src/akonadicontrol/CMakeLists.txt --- old/akonadi-16.12.1/src/akonadicontrol/CMakeLists.txt 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/akonadicontrol/CMakeLists.txt 2017-01-19 13:12:42.000000000 +0100 @@ -41,6 +41,7 @@ target_link_libraries(akonadi_control akonadi_shared KF5AkonadiPrivate + KF5::CoreAddons KF5::ConfigCore Qt5::Core Qt5::DBus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/akonadicontrol/main.cpp new/akonadi-16.12.2/src/akonadicontrol/main.cpp --- old/akonadi-16.12.1/src/akonadicontrol/main.cpp 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/akonadicontrol/main.cpp 2017-01-19 13:12:42.000000000 +0100 @@ -21,6 +21,7 @@ #include "controlmanager.h" #include "processcontrol.h" #include "akonadicontrol_debug.h" +#include "akonadi_version.h" #include <shared/akapplication.h> @@ -32,6 +33,7 @@ #include <QDBusError> #include <KCrash/KCrash> +#include <KAboutData> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -53,6 +55,14 @@ { AkGuiApplication app(argc, argv, AKONADICONTROL_LOG()); app.setDescription(QStringLiteral("Akonadi Control Process\nDo not run this manually, use 'akonadictl' instead to start/stop Akonadi.")); + + KAboutData aboutData(QStringLiteral("akonadi_control"), + QStringLiteral("Akonadi Control"), + QStringLiteral(AKONADI_VERSION_STRING), + QStringLiteral("Akonadi Control"), + KAboutLicense::LGPL_V2); + KAboutData::setApplicationData(aboutData); + app.parseCommandLine(); // try to acquire the lock first, that means there is no second instance trying to start up at the same time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/akonadictl/CMakeLists.txt new/akonadi-16.12.2/src/akonadictl/CMakeLists.txt --- old/akonadi-16.12.1/src/akonadictl/CMakeLists.txt 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/akonadictl/CMakeLists.txt 2017-01-19 13:12:42.000000000 +0100 @@ -19,6 +19,7 @@ target_link_libraries(akonadictl akonadi_shared KF5AkonadiPrivate + KF5::CoreAddons Qt5::Core Qt5::DBus ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/akonadictl/main.cpp new/akonadi-16.12.2/src/akonadictl/main.cpp --- old/akonadi-16.12.1/src/akonadictl/main.cpp 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/akonadictl/main.cpp 2017-01-19 13:12:42.000000000 +0100 @@ -25,12 +25,16 @@ #include <QDBusConnection> #include <QDBusConnectionInterface> +#include <KAboutData> + #include <shared/akapplication.h> #include "controlmanagerinterface.h" #include "janitorinterface.h" #include "akonadistarter.h" +#include "akonadi_version.h" + #include <QSettings> #include <private/protocol_p.h> @@ -189,6 +193,13 @@ " (can take some time)")); + KAboutData aboutData(QStringLiteral("akonadictl"), + QStringLiteral("akonadictl"), + QStringLiteral(AKONADI_VERSION_STRING), + QStringLiteral("akonadictl"), + KAboutLicense::LGPL_V2); + KAboutData::setApplicationData(aboutData); + app.addPositionalCommandLineOption(QStringLiteral("command"), QStringLiteral("Command to execute"), QStringLiteral("start|stop|restart|status|vacuum|fsck")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/core/monitor_p.cpp new/akonadi-16.12.2/src/core/monitor_p.cpp --- old/akonadi-16.12.1/src/core/monitor_p.cpp 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/core/monitor_p.cpp 2017-01-19 13:12:42.000000000 +0100 @@ -377,8 +377,10 @@ if (msg.type() == Protocol::Command::CollectionChangeNotification && static_cast<const Protocol::CollectionChangeNotification&>(msg).operation() == Protocol::CollectionChangeNotification::Remove) { - //For collection removals the collection is gone anyways, so we can't fetch it. Rid will be set later on instead. - return true; + // For collection removals the collection is gone already, so we can't fetch it, + // but we have to at least obtain the ancestor chain. + const qint64 parentCollection = static_cast<const Protocol::CollectionChangeNotification &>(msg).parentCollection(); + return parentCollection <= -1 || collectionCache->ensureCached(parentCollection, mCollectionFetchScope); } if (fetchCollections()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/server/CMakeLists.txt new/akonadi-16.12.2/src/server/CMakeLists.txt --- old/akonadi-16.12.1/src/server/CMakeLists.txt 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/server/CMakeLists.txt 2017-01-19 13:12:42.000000000 +0100 @@ -171,6 +171,7 @@ set_target_properties(akonadiserver PROPERTIES OUTPUT_NAME akonadiserver) target_link_libraries(akonadiserver libakonadiserver + KF5::CoreAddons ) install(TARGETS akonadiserver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/server/main.cpp new/akonadi-16.12.2/src/server/main.cpp --- old/akonadi-16.12.1/src/server/main.cpp 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/server/main.cpp 2017-01-19 13:12:42.000000000 +0100 @@ -18,6 +18,7 @@ ***************************************************************************/ #include "akonadi.h" +#include "akonadi_version.h" #include "akonadiserver_debug.h" #include <shared/akapplication.h> @@ -30,6 +31,8 @@ #include <QDBusError> #include <QTimer> +#include <KAboutData> + #include <cstdlib> #ifdef QT_STATICPLUGIN @@ -44,6 +47,14 @@ AkCoreApplication app(argc, argv, AKONADISERVER_LOG()); app.setDescription(QStringLiteral("Akonadi Server\nDo not run manually, use 'akonadictl' instead to start/stop Akonadi.")); + // Set KAboutData so that DrKonqi can report bugs + KAboutData aboutData(QStringLiteral("akonadiserver"), + QStringLiteral("Akonadi Server"), // we don't have any localization in the server + QStringLiteral(AKONADI_VERSION_STRING), + QStringLiteral("Akonadi Server"), // we don't have any localization in the server + KAboutLicense::LGPL_V2); + KAboutData::setApplicationData(aboutData); + #if !defined(NDEBUG) const QCommandLineOption startWithoutControlOption( QStringLiteral("start-without-control"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/server/search/searchmanager.cpp new/akonadi-16.12.2/src/server/search/searchmanager.cpp --- old/akonadi-16.12.1/src/server/search/searchmanager.cpp 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/server/search/searchmanager.cpp 2017-01-19 13:12:42.000000000 +0100 @@ -365,7 +365,7 @@ return; } - DataStore::self()->beginTransaction(); + Transaction transaction(DataStore::self()); // Unlink all items that were not in search results from the collection QVariantList toRemove; @@ -377,7 +377,7 @@ } } - if (!DataStore::self()->commitTransaction()) { + if (!transaction.commit()) { wakeUpCaller(cond); return; } @@ -432,10 +432,7 @@ return; } - const bool existingTransaction = DataStore::self()->inTransaction(); - if (!existingTransaction) { - DataStore::self()->beginTransaction(); - } + Transaction transaction(DataStore::self(), !DataStore::self()->inTransaction()); // First query all the IDs we got from search plugin/agent against the DB. // This will remove IDs that no longer exist in the DB. @@ -459,7 +456,7 @@ } if (items.isEmpty()) { - qCDebug(AKONADISERVER_LOG) << "Added results: 0"; + qCDebug(AKONADISERVER_LOG) << "Added results: 0 (no existing result)"; return; } @@ -467,7 +464,7 @@ Collection::addPimItem(collection.id(), item.id()); } - if (!existingTransaction && !DataStore::self()->commitTransaction()) { + if (!transaction.commit()) { qCDebug(AKONADISERVER_LOG) << "Failed to commit transaction"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.1/src/widgets/collectionpropertiesdialog.cpp new/akonadi-16.12.2/src/widgets/collectionpropertiesdialog.cpp --- old/akonadi-16.12.1/src/widgets/collectionpropertiesdialog.cpp 2017-01-08 16:41:33.000000000 +0100 +++ new/akonadi-16.12.2/src/widgets/collectionpropertiesdialog.cpp 2017-01-19 13:12:42.000000000 +0100 @@ -54,7 +54,8 @@ page->save(mCollection); } - CollectionModifyJob *job = new CollectionModifyJob(mCollection, q); + // We use WA_DeleteOnClose => Don't use dialog as parent otherwise we can't save modified collection. + CollectionModifyJob *job = new CollectionModifyJob(mCollection); connect(job, SIGNAL(result(KJob*)), q, SLOT(saveResult(KJob*))); } @@ -64,7 +65,6 @@ // TODO qCWarning(AKONADIWIDGETS_LOG) << job->errorString(); } - q->deleteLater(); } void setCurrentPage(const QString &name)
