Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2019-08-19 21:28:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Mon Aug 19 21:28:01 2019 rev:35 rq:723567 version:19.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2019-07-21 11:34:09.764779139 +0200 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.22127/akonadiconsole.changes 2019-08-19 21:28:01.820638471 +0200 @@ -1,0 +2,34 @@ +Fri Aug 9 08:29:52 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 19.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08.0.php +- Changes since 19.07.90: + * Adapt to KCalendarCore namespace change + +------------------------------------------------------------------- +Tue Aug 06 16:50:46 UTC 2019 - [email protected] + +- Update to 19.07.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08-rc.php +- No code changes since 19.07.80 + +------------------------------------------------------------------- +Tue Jul 23 11:58:54 UTC 2019 - [email protected] + +- Update to 19.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08-beta.php +- Changes since 19.04.3: + * When we use framework 5.59.0 we can use new logging file directory + * Prefer https: over http: URLs + * Make it compile without deprecated method + * increase copyright + * Fix clazy warning + * Remove support for Collection references + +------------------------------------------------------------------- Old: ---- akonadiconsole-19.04.3.tar.xz New: ---- akonadiconsole-19.08.0.tar.xz akonadiconsole-19.08.0.tar.xz.sig applications.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.2cobED/_old 2019-08-19 21:28:02.624638307 +0200 +++ /var/tmp/diff_new_pack.2cobED/_new 2019-08-19 21:28:02.624638307 +0200 @@ -19,14 +19,19 @@ %define kf5_version 5.28.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang Name: akonadiconsole -Version: 19.04.3 +Version: 19.08.0 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source0: %{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz +%if %{with lang} +Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif BuildRequires: akonadi-contact-devel BuildRequires: akonadi-mime-devel BuildRequires: akonadi-search-devel @@ -89,12 +94,12 @@ %files %license COPYING COPYING.LIB COPYING.DOC +%{_kf5_debugdir}/akonadiconsole.categories +%{_kf5_debugdir}/akonadiconsole.renamecategories %dir %{_kf5_iconsdir}/hicolor/256x256 %dir %{_kf5_iconsdir}/hicolor/256x256/apps %{_kf5_applicationsdir}/org.kde.akonadiconsole.desktop %{_kf5_bindir}/akonadiconsole -%{_kf5_debugdir}/akonadiconsole.categories -%{_kf5_debugdir}/akonadiconsole.renamecategories %{_kf5_iconsdir}/hicolor/*/apps/akonadiconsole.png %{_kf5_libdir}/libakonadiconsole.so.* %{_kf5_sharedir}/kconf_update/ ++++++ akonadiconsole-19.04.3.tar.xz -> akonadiconsole-19.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/CMakeLists.txt new/akonadiconsole-19.08.0/CMakeLists.txt --- old/akonadiconsole-19.04.3/CMakeLists.txt 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/CMakeLists.txt 2019-08-04 19:34:21.000000000 +0200 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.11.3") +set(KDEPIM_VERSION_NUMBER "5.12.0") project(akonadiconsole VERSION ${KDEPIM_VERSION_NUMBER}) -set(KF5_MIN_VERSION "5.56.0") +set(KF5_MIN_VERSION "5.60.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -27,7 +27,7 @@ # Do NOT add quote -set(KDEPIM_DEV_VERSION ) +set(KDEPIM_DEV_VERSION) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) @@ -40,22 +40,18 @@ set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.11.3") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.11.3") -set(AKONADI_VERSION "5.11.3") -set(AKONADI_SEARCH_VERSION "5.11.3") +set(AKONADI_CONTACT_VERSION "5.12.0") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.12.0") +set(AKONADI_VERSION "5.12.0") +set(AKONADI_SEARCH_VERSION "5.12.0") -set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") -set(KDEPIM_LIB_SOVERSION "5") - - -set(QT_REQUIRED_VERSION "5.10.0") +set(QT_REQUIRED_VERSION "5.11.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.11.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.11.3") -set(KCALENDARCORE_LIB_VERSION "5.11.3") -set(KCONTACTS_LIB_VERSION "5.11.3") -set(KMIME_LIB_VERSION "5.11.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.12.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.12.0") +set(KCALENDARCORE_LIB_VERSION "5.12.0") +set(KCONTACTS_LIB_VERSION "5.12.0") +set(KMIME_LIB_VERSION "5.12.0") # Find KF5 package find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -89,7 +85,7 @@ find_package(Xapian CONFIG) set_package_properties(Xapian PROPERTIES DESCRIPTION "The Xapian search engine library" - URL "http://xapian.org"; + URL "https://xapian.org"; TYPE REQUIRED ) @@ -97,12 +93,12 @@ set(ENABLE_SEARCH TRUE) set(ENABLE_CONTENTVIEWS TRUE) endif() - +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) configure_file(config-akonadiconsole.h.cmake ${CMAKE_BINARY_DIR}/config-akonadiconsole.h) -install( FILES akonadiconsole.renamecategories akonadiconsole.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install(FILES akonadiconsole.renamecategories akonadiconsole.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) add_subdirectory(src) if(BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/autotests/jobtrackermodeltest.cpp new/akonadiconsole-19.08.0/autotests/jobtrackermodeltest.cpp --- old/akonadiconsole-19.04.3/autotests/jobtrackermodeltest.cpp 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/autotests/jobtrackermodeltest.cpp 2019-08-04 19:34:21.000000000 +0200 @@ -181,8 +181,8 @@ model.jobTracker().signalUpdates(); // THEN - QCOMPARE(sessionIndex.child(0, JobTrackerModel::ColumnState).data().toString(), QStringLiteral("Ended")); - QCOMPARE(sessionIndex.child(1, JobTrackerModel::ColumnState).data().toString(), QStringLiteral("Failed: error")); + QCOMPARE(model.index(0, JobTrackerModel::ColumnState, sessionIndex).data().toString(), QStringLiteral("Ended")); + QCOMPARE(model.index(1, JobTrackerModel::ColumnState, sessionIndex).data().toString(), QStringLiteral("Failed: error")); } QTEST_GUILESS_MAIN(JobTrackerModelTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/autotests/jobtrackersearchwidgettest.cpp new/akonadiconsole-19.08.0/autotests/jobtrackersearchwidgettest.cpp --- old/akonadiconsole-19.04.3/autotests/jobtrackersearchwidgettest.cpp 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/autotests/jobtrackersearchwidgettest.cpp 2019-08-04 19:34:21.000000000 +0200 @@ -40,7 +40,15 @@ JobTrackerSearchWidget w; QHBoxLayout *mainLayout = w.findChild<QHBoxLayout *>(QStringLiteral("mainlayout")); QVERIFY(mainLayout); - QCOMPARE(mainLayout->margin(), 0); + int top = -1; + int bottom = -1; + int left = -1; + int right = -1; + mainLayout->getContentsMargins(&left, &top, &right, &bottom); + QCOMPARE(top, 0); + QCOMPARE(bottom, 0); + QCOMPARE(left, 0); + QCOMPARE(right, 0); QLineEdit *mSearchLineEdit = w.findChild<QLineEdit *>(QStringLiteral("searchline")); QVERIFY(mSearchLineEdit); @@ -62,7 +70,7 @@ void JobTrackerSearchWidgetTest::shouldEmitSignal() { JobTrackerSearchWidget w; - QSignalSpy searchWidgetSignal(&w, SIGNAL(searchTextChanged(QString))); + QSignalSpy searchWidgetSignal(&w, &JobTrackerSearchWidget::searchTextChanged); QLineEdit *mSearchLineEdit = w.findChild<QLineEdit *>(QStringLiteral("searchline")); const QString foo = QStringLiteral("foo"); mSearchLineEdit->setText(foo); @@ -76,7 +84,7 @@ void JobTrackerSearchWidgetTest::shouldEmitColumnChanged() { JobTrackerSearchWidget w; - QSignalSpy columnChangedSignal(&w, SIGNAL(columnChanged(int))); + QSignalSpy columnChangedSignal(&w, &JobTrackerSearchWidget::columnChanged); QComboBox *mSelectColumn = w.findChild<QComboBox *>(QStringLiteral("selectcolumn")); mSelectColumn->setCurrentIndex(2); QCOMPARE(columnChangedSignal.count(), 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/src/akonadibrowsermodel.cpp new/akonadiconsole-19.08.0/src/akonadibrowsermodel.cpp --- old/akonadiconsole-19.04.3/src/akonadibrowsermodel.cpp 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/src/akonadibrowsermodel.cpp 2019-08-04 19:34:21.000000000 +0200 @@ -24,10 +24,10 @@ #include <kcontacts/addressee.h> #include <kcontacts/contactgroup.h> -#include <KCalCore/Incidence> -#include <KCalCore/Event> +#include <KCalendarCore/Incidence> +#include <KCalendarCore/Event> -typedef QSharedPointer<KCalCore::Incidence> IncidencePtr; +typedef QSharedPointer<KCalendarCore::Incidence> IncidencePtr; class AkonadiBrowserModel::State { @@ -203,7 +203,7 @@ case 2: return incidence->dtStart().toString(); case 3: - return incidence->dateTime(KCalCore::Incidence::RoleEnd).toString(); + return incidence->dateTime(KCalendarCore::Incidence::RoleEnd).toString(); case 4: return incidence->typeStr(); default: @@ -364,7 +364,7 @@ if (left.column() == 1) { return leftInc->dtStart() < rightInc->dtStart(); } else if (left.column() == 2) { - return leftInc->dateTime(KCalCore::IncidenceBase::RoleEnd) < rightInc->dateTime(KCalCore::IncidenceBase::RoleEnd); + return leftInc->dateTime(KCalendarCore::IncidenceBase::RoleEnd) < rightInc->dateTime(KCalendarCore::IncidenceBase::RoleEnd); } } } else if (mBrowserModel->itemDisplayMode() == AkonadiBrowserModel::MailMode) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/src/browserwidget.cpp new/akonadiconsole-19.08.0/src/browserwidget.cpp --- old/akonadiconsole-19.04.3/src/browserwidget.cpp 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/src/browserwidget.cpp 2019-08-04 19:34:21.000000000 +0200 @@ -54,8 +54,8 @@ #include <kcontacts/addressee.h> #include <kcontacts/contactgroup.h> -#include <KCalCore/Incidence> -#include <KCalCore/ICalFormat> +#include <KCalendarCore/Incidence> +#include <KCalendarCore/ICalFormat> #include "akonadiconsole_debug.h" #include <kconfig.h> @@ -334,7 +334,7 @@ } else if (item.hasPayload<KContacts::ContactGroup>()) { mContactGroupView->setItem(item); contentUi.stack->setCurrentWidget(mContactGroupView->parentWidget()); - } else if (item.hasPayload<KCalCore::Incidence::Ptr>()) { + } else if (item.hasPayload<KCalendarCore::Incidence::Ptr>()) { mIncidenceView->setItem(item); contentUi.stack->setCurrentWidget(mIncidenceView->parentWidget()); } else if (item.mimeType() == QLatin1String("message/rfc822") @@ -356,14 +356,14 @@ // Note that this is true for *all* items as soon as the binary format is enabled. // Independently from how they are actually stored in the database. - if (item.hasPayload<KCalCore::Incidence::Ptr>()) { + if (item.hasPayload<KCalendarCore::Incidence::Ptr>()) { quint32 magic; QDataStream input(data); input >> magic; - KCalCore::ICalFormat format; - if (magic == KCalCore::IncidenceBase::magicSerializationIdentifier()) { - // Binary format isn't readable, show KCalCore string instead. - auto incidence = item.payload<KCalCore::Incidence::Ptr>(); + KCalendarCore::ICalFormat format; + if (magic == KCalendarCore::IncidenceBase::magicSerializationIdentifier()) { + // Binary format isn't readable, show KCalendarCore string instead. + auto incidence = item.payload<KCalendarCore::Incidence::Ptr>(); data = "(converted from binary format)\n" + format.toRawString(incidence); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/src/logging.cpp new/akonadiconsole-19.08.0/src/logging.cpp --- old/akonadiconsole-19.04.3/src/logging.cpp 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/src/logging.cpp 2019-08-04 19:34:21.000000000 +0200 @@ -145,7 +145,7 @@ QTextStream stream(&file); for (int row = 0, cnt = mModel->rowCount(); row < cnt; ++row) { const auto msg = mModel->data(mModel->index(row, 0), LoggingModel::MessageRole).value<LoggingModel::Message>(); - stream << "[" << QDateTime::fromTime_t(msg.timestamp).toString(Qt::ISODateWithMs) << "] " + stream << "[" << QDateTime::fromMSecsSinceEpoch(msg.timestamp, Qt::UTC).toString(Qt::ISODateWithMs) << "] " << msg.app << " "; if (!msg.category.isEmpty()) { stream << msg.category << " "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/src/main.cpp new/akonadiconsole-19.08.0/src/main.cpp --- old/akonadiconsole-19.04.3/src/main.cpp 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/src/main.cpp 2019-08-04 19:34:21.000000000 +0200 @@ -47,7 +47,7 @@ QStringLiteral("0.99"), QStringLiteral("The Management and Debugging Console for Akonadi"), KAboutLicense::GPL, - QStringLiteral("(c) 2006-2018 the Akonadi developer"), QString(), + QStringLiteral("(c) 2006-2019 the Akonadi developer"), QString(), QStringLiteral("https://community.kde.org/KDE_PIM/akonadi";)); QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("akonadi"))); aboutData.addAuthor(QStringLiteral("Tobias König"), QStringLiteral("Author"), QStringLiteral("[email protected]")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/src/notificationmonitor.cpp new/akonadiconsole-19.08.0/src/notificationmonitor.cpp --- old/akonadiconsole-19.04.3/src/notificationmonitor.cpp 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/src/notificationmonitor.cpp 2019-08-04 19:34:21.000000000 +0200 @@ -74,7 +74,7 @@ hLayout->addWidget(mTypeFilterCombo = new KCheckComboBox(this)); hLayout->addStretch(); mTypeFilterCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents); - mTypeFilterCombo->setMinimumWidth(fontMetrics().width(QStringLiteral("Subscription,Items,Collections")) + 60); // make it wide enough for most use cases + mTypeFilterCombo->setMinimumWidth(fontMetrics().boundingRect(QStringLiteral("Subscription,Items,Collections")).width() + 60); // make it wide enough for most use cases m_filterModel->setTypeFilter(mTypeFilterCombo); m_splitter = new QSplitter(this); @@ -305,7 +305,7 @@ appendRow(parent, QStringLiteral("Flags"), toString(item.flags())); auto tagItem = new QStandardItem(QStringLiteral("Tags")); const auto tags = item.tags(); - for (const auto tag : tags) { + for (const auto &tag : tags) { auto item = new QStandardItem(QString::number(tag.id())); populateTagTree(item, tag); tagItem->appendRow(item); @@ -315,7 +315,7 @@ appendRow(parent, QStringLiteral("VRefs"), toString(item.virtualReferences())); auto relationItem = new QStandardItem(QStringLiteral("Relations")); const auto relations = item.relations(); - for (const auto relation : relations) { + for (const auto &relation : relations) { auto item = new QStandardItem(QStringLiteral("%lld-%lld %s").arg(QString::number(relation.left()), QString::number(relation.right()), QString::fromUtf8(relation.type()))); relationItem->appendRow(item); } @@ -391,7 +391,6 @@ appendRow(parent, QStringLiteral("DisplayPref"), toString(collection.displayPref())); appendRow(parent, QStringLiteral("SyncPref"), toString(collection.syncPref())); appendRow(parent, QStringLiteral("IndexPref"), toString(collection.indexPref())); - appendRow(parent, QStringLiteral("Referenced"), toString(collection.referenced())); appendRow(parent, QStringLiteral("Virtual"), toString(collection.isVirtual())); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/src/org.kde.akonadiconsole.desktop new/akonadiconsole-19.08.0/src/org.kde.akonadiconsole.desktop --- old/akonadiconsole-19.04.3/src/org.kde.akonadiconsole.desktop 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/src/org.kde.akonadiconsole.desktop 2019-08-04 19:34:21.000000000 +0200 @@ -14,6 +14,7 @@ Name[ia]=Consol de Akonadi Name[it]=Console Akonadi Name[ko]=Akonadi 콘솔 +Name[lt]=Akonadi pultas Name[nl]=Akonadi-console Name[pl]=Konsola Akonadi Name[pt]=Consola do Akonadi @@ -49,6 +50,7 @@ Comment[ia]=Consol de Akonadi pro gestion e cribrar Comment[it]=Console di gestione e debugging di Akonadi Comment[ko]=Akonadi 관리 및 디버깅 콘솔 +Comment[lt]=Akonadi tvarkymo ir derinimo pultas Comment[nl]=Akonadi-beheer en debugging-console Comment[pl]=Konsola Akonadi do zarządzania i diagnostyki Comment[pt]=Consola de Gestão e Depuração do Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.04.3/src/querydebugger.cpp new/akonadiconsole-19.08.0/src/querydebugger.cpp --- old/akonadiconsole-19.04.3/src/querydebugger.cpp 2019-06-24 07:05:09.000000000 +0200 +++ new/akonadiconsole-19.08.0/src/querydebugger.cpp 2019-08-04 19:34:21.000000000 +0200 @@ -243,7 +243,7 @@ } void addQuery(qint64 connectionId, qint64 timestamp, uint duration, - const QString &queryStr, const QMap<QString, QVariant> values, + const QString &queryStr, const QMap<QString, QVariant> &values, int resultsCount, const QList<QList<QVariant>> &results, const QString &error) { auto con = mConnectionById.value(connectionId);
