Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2020-05-23 17:20:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Sat May 23 17:20:50 2020 rev:45 rq:806299 version:20.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2020-04-29 20:45:46.312139347 +0200 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.2738/akonadiconsole.changes 2020-05-23 17:20:53.750558444 +0200 @@ -1,0 +2,12 @@ +Fri May 15 15:40:48 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.04.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2020-05-apps-update +- Changes since 20.04.0: + * Port away from a DBus call to deprecated KConfigSkeleton::writeConfig() + * Fix assert due to off-by-one in beginRemoveRows call + * Always make libkdepim a required dependency + +------------------------------------------------------------------- @@ -19,2 +30,0 @@ - * For more details please see: - * https://kde.org/announcements/releases/20.04-rc @@ -28,2 +37,0 @@ - * For more details please see: - * https://kde.org/announcements/releases/20.04-beta @@ -41 +49 @@ - * https://www.kde.org/announcements/releases/19.12.3 + * https://kde.org/announcements/releases/2020-03-apps-update @@ -55 +63 @@ - * https://www.kde.org/announcements/releases/19.12.2 + * https://kde.org/announcements/releases/2020-02-apps-update Old: ---- akonadiconsole-20.04.0.tar.xz akonadiconsole-20.04.0.tar.xz.sig New: ---- akonadiconsole-20.04.1.tar.xz akonadiconsole-20.04.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.zXWEQV/_old 2020-05-23 17:20:54.470560002 +0200 +++ /var/tmp/diff_new_pack.zXWEQV/_new 2020-05-23 17:20:54.474560011 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadiconsole -Version: 20.04.0 +Version: 20.04.1 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ akonadiconsole-20.04.0.tar.xz -> akonadiconsole-20.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-20.04.0/CMakeLists.txt new/akonadiconsole-20.04.1/CMakeLists.txt --- old/akonadiconsole-20.04.0/CMakeLists.txt 2020-04-07 10:33:30.000000000 +0200 +++ new/akonadiconsole-20.04.1/CMakeLists.txt 2020-04-30 07:12:13.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.14.0") +set(KDEPIM_VERSION_NUMBER "5.14.1") project(akonadiconsole VERSION ${KDEPIM_VERSION_NUMBER}) set(KF5_MIN_VERSION "5.68.0") @@ -40,16 +40,16 @@ set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.14.0") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.14.0") -set(AKONADI_VERSION "5.14.0") -set(AKONADI_SEARCH_VERSION "5.14.0") +set(AKONADI_CONTACT_VERSION "5.14.1") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.14.1") +set(AKONADI_VERSION "5.14.1") +set(AKONADI_SEARCH_VERSION "5.14.1") set(QT_REQUIRED_VERSION "5.12.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.14.0") -set(LIBKDEPIM_LIB_VERSION_LIB "5.14.0") -set(KMIME_LIB_VERSION "5.14.0") +set(MESSAGELIB_LIB_VERSION_LIB "5.14.1") +set(LIBKDEPIM_LIB_VERSION_LIB "5.14.1") +set(KMIME_LIB_VERSION "5.14.1") # Find KF5 package find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -72,12 +72,12 @@ find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) +find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED) # Because of KPIM::KCheckComboBox, KPIM::UiStateSaver if (NOT WIN32) find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) - find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED) find_package(Xapian CONFIG) @@ -87,7 +87,6 @@ TYPE REQUIRED ) - set(ENABLE_LIBKDEPIM TRUE) set(ENABLE_SEARCH TRUE) set(ENABLE_CONTENTVIEWS TRUE) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-20.04.0/config-akonadiconsole.h.cmake new/akonadiconsole-20.04.1/config-akonadiconsole.h.cmake --- old/akonadiconsole-20.04.0/config-akonadiconsole.h.cmake 2020-04-07 10:33:30.000000000 +0200 +++ new/akonadiconsole-20.04.1/config-akonadiconsole.h.cmake 2020-04-30 07:12:13.000000000 +0200 @@ -1,3 +1,2 @@ -#cmakedefine ENABLE_LIBKDEPIM 1 #cmakedefine ENABLE_SEARCH 1 #cmakedefine ENABLE_CONTENTVIEWS 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-20.04.0/src/CMakeLists.txt new/akonadiconsole-20.04.1/src/CMakeLists.txt --- old/akonadiconsole-20.04.0/src/CMakeLists.txt 2020-04-07 10:33:30.000000000 +0200 +++ new/akonadiconsole-20.04.1/src/CMakeLists.txt 2020-04-30 07:12:13.000000000 +0200 @@ -114,6 +114,7 @@ KF5::ItemViews KF5::TextWidgets KF5::XmlGui + KF5::Libkdepim ) if (ENABLE_SEARCH) @@ -131,12 +132,6 @@ ) endif() -if (ENABLE_LIBKDEPIM) - target_link_libraries(libakonadiconsole - KF5::Libkdepim - ) -endif() - set_target_properties(libakonadiconsole PROPERTIES OUTPUT_NAME akonadiconsole VERSION ${KDEPIM_LIB_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-20.04.0/src/agentconfigmodel.cpp new/akonadiconsole-20.04.1/src/agentconfigmodel.cpp --- old/akonadiconsole-20.04.0/src/agentconfigmodel.cpp 2020-04-07 10:33:30.000000000 +0200 +++ new/akonadiconsole-20.04.1/src/agentconfigmodel.cpp 2020-04-30 07:12:13.000000000 +0200 @@ -147,6 +147,6 @@ void AgentConfigModel::writeConfig() { - m_interface->call(QStringLiteral("writeConfig")); + m_interface->call(QStringLiteral("save")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-20.04.0/src/debugmodel.cpp new/akonadiconsole-20.04.1/src/debugmodel.cpp --- old/akonadiconsole-20.04.0/src/debugmodel.cpp 2020-04-07 10:33:30.000000000 +0200 +++ new/akonadiconsole-20.04.1/src/debugmodel.cpp 2020-04-30 07:12:13.000000000 +0200 @@ -85,7 +85,7 @@ return false; } - beginRemoveRows(parent, row, row + count); + beginRemoveRows(parent, row, row + count - 1); mMessages.remove(row, count); QVector<QString> toDelete; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-20.04.0/src/mainwindow.cpp new/akonadiconsole-20.04.1/src/mainwindow.cpp --- old/akonadiconsole-20.04.0/src/mainwindow.cpp 2020-04-07 10:33:30.000000000 +0200 +++ new/akonadiconsole-20.04.1/src/mainwindow.cpp 2020-04-30 07:12:13.000000000 +0200 @@ -22,9 +22,7 @@ #include "mainwindow.h" #include "config-akonadiconsole.h" -#ifdef ENABLE_LIBKDEPIM #include <Libkdepim/UiStateSaver> -#endif #include <KActionCollection> #include <KConfigGroup> @@ -42,9 +40,7 @@ KStandardAction::quit(qApp, &QApplication::quit, actionCollection()); setupGUI(Keys /*| ToolBar | StatusBar*/ | Save | Create, QStringLiteral("akonadiconsoleui.rc")); -#ifdef ENABLE_LIBKDEPIM KPIM::UiStateSaver::restoreState(this, KConfigGroup(KSharedConfig::openConfig(), "UiState")); -#endif KMessageBox::information(this, QStringLiteral("<p>Akonadi Console is purely a development tool. " "It allows you to view and change internal data structures of Akonadi. " "You should only change data in here if you know what you are doing, otherwise " @@ -60,10 +56,8 @@ void MainWindow::closeEvent(QCloseEvent *event) { -#ifdef ENABLE_LIBKDEPIM KConfigGroup config(KSharedConfig::openConfig(), "UiState"); KPIM::UiStateSaver::saveState(this, config); KSharedConfig::openConfig()->sync(); -#endif KXmlGuiWindow::closeEvent(event); }
