Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2020-03-19 19:41:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Thu Mar 19 19:41:34 2020 rev:76 rq:785295 version:5.68.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2020-02-14 16:32:28.607421968 +0100 +++ /work/SRC/openSUSE:Factory/.kactivities5.new.3160/kactivities5.changes 2020-03-19 19:43:30.731959736 +0100 @@ -1,0 +2,13 @@ +Sun Mar 8 09:17:33 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.68.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.68.0.php +- Changes since 5.67.0: + * Fix issue finding the Boost include directories + * Make it compile against qt5.15. (QProcess::startDetached(QString) is deprecated) + * Use exposed DBus methods to switch activities in CLI + * Use ecm_qt_install_logging_categories over manual categories file + +------------------------------------------------------------------- Old: ---- kactivities-5.67.0.tar.xz kactivities-5.67.0.tar.xz.sig New: ---- kactivities-5.68.0.tar.xz kactivities-5.68.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.oLVPqR/_old 2020-03-19 19:43:31.507960186 +0100 +++ /var/tmp/diff_new_pack.oLVPqR/_new 2020-03-19 19:43:31.511960189 +0100 @@ -17,7 +17,7 @@ %define lname libKF5Activities5 -%define _tar_path 5.67 +%define _tar_path 5.68 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kactivities5 -Version: 5.67.0 +Version: 5.68.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0-or-later ++++++ kactivities-5.67.0.tar.xz -> kactivities-5.68.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/.gitignore new/kactivities-5.68.0/.gitignore --- old/kactivities-5.67.0/.gitignore 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/.gitignore 2020-03-07 09:49:56.000000000 +0100 @@ -16,3 +16,4 @@ GRTAGS GSYMS GTAGS +.cmake/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/CMakeLists.txt new/kactivities-5.68.0/CMakeLists.txt --- old/kactivities-5.67.0/CMakeLists.txt 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/CMakeLists.txt 2020-03-07 09:49:56.000000000 +0100 @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.5) # KDE Frameworks -set(KF5_VERSION "5.67.0") # handled by release scripts -set(KF5_DEP_VERSION "5.67.0") # handled by release scripts +set(KF5_VERSION "5.68.0") # handled by release scripts +set(KF5_DEP_VERSION "5.68.0") # handled by release scripts project (KActivities VERSION ${KF5_VERSION}) option (KACTIVITIES_LIBRARY_ONLY "If true, compiles only the KActivities library, without the QML imports." OFF) @@ -24,7 +24,7 @@ # Extra CMake stuff include(FeatureSummary) -find_package(ECM 5.67.0 NO_MODULE) +find_package(ECM 5.68.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -72,7 +72,7 @@ ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054300) add_definitions(-DQT_NO_FOREACH) add_subdirectory (src) @@ -119,8 +119,6 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install(FILES kactivities.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - # Write out the features feature_summary (WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/autotests/core/Process.cpp new/kactivities-5.68.0/autotests/core/Process.cpp --- old/kactivities-5.67.0/autotests/core/Process.cpp 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/autotests/core/Process.cpp 2020-03-07 09:49:56.000000000 +0100 @@ -81,7 +81,7 @@ // qDebug() << env; s_process->setEnvironment(env); - s_process->start(QStringLiteral("kactivitymanagerd")); + s_process->start(QStringLiteral("kactivitymanagerd"), QStringList()); s_process->waitForStarted(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/kactivities.categories new/kactivities-5.68.0/kactivities.categories --- old/kactivities-5.67.0/kactivities.categories 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/kactivities.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.kactivities.lib.core kactivities core lib DEFAULT_SEVERITY [WARNING] IDENTIFIER [KAMD_CORELIB] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/src/CMakeLists.txt new/kactivities-5.68.0/src/CMakeLists.txt --- old/kactivities-5.67.0/src/CMakeLists.txt 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/src/CMakeLists.txt 2020-03-07 09:49:56.000000000 +0100 @@ -32,9 +32,15 @@ include_directories ( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ) add_subdirectory (imports) endif () add_subdirectory (cli) + +ecm_qt_install_logging_categories( + EXPORT KACTIVITIES + FILE kactivities.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/src/cli/main.cpp new/kactivities-5.68.0/src/cli/main.cpp --- old/kactivities-5.67.0/src/cli/main.cpp 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/src/cli/main.cpp 2020-03-07 09:49:56.000000000 +0100 @@ -144,35 +144,13 @@ DEFINE_COMMAND(nextActivity, 0) { - const auto activities = controller->activities(); - const auto currentActivity = controller->currentActivity(); - - for (int i = 0; i < activities.count() - 1; ++i) { - if (activities[i] == currentActivity) { - switchToActivity(activities[i + 1]); - return 0; - } - } - - switchToActivity(activities[0]); - + controller->nextActivity(); return 0; } DEFINE_COMMAND(previousActivity, 0) { - const auto activities = controller->activities(); - const auto currentActivity = controller->currentActivity(); - - for (int i = 1; i < activities.count(); ++i) { - if (activities[i] == currentActivity) { - switchToActivity(activities[i - 1]); - return 0; - } - } - - switchToActivity(activities.last()); - + controller->previousActivity(); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/src/lib/CMakeLists.txt new/kactivities-5.68.0/src/lib/CMakeLists.txt --- old/kactivities-5.67.0/src/lib/CMakeLists.txt 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/src/lib/CMakeLists.txt 2020-03-07 09:49:56.000000000 +0100 @@ -65,7 +65,14 @@ application_interface ) -ecm_qt_declare_logging_category(KActivities_LIB_SRCS HEADER debug_p.h IDENTIFIER KAMD_CORELIB CATEGORY_NAME org.kde.kactivities.lib.core DEFAULT_SEVERITY Warning) +ecm_qt_declare_logging_category(KActivities_LIB_SRCS + HEADER debug_p.h + IDENTIFIER KAMD_CORELIB + CATEGORY_NAME org.kde.kactivities.lib.core + DEFAULT_SEVERITY Warning + DESCRIPTION "kactivities core lib" + EXPORT KACTIVITIES +) add_library ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/src/lib/controller.cpp new/kactivities-5.68.0/src/lib/controller.cpp --- old/kactivities-5.67.0/src/lib/controller.cpp 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/src/lib/controller.cpp 2020-03-07 09:49:56.000000000 +0100 @@ -120,6 +120,24 @@ DBusFuture::fromVoid(); } +QFuture<void> Controller::previousActivity() +{ + return Manager::isServiceRunning() ? + DBusFuture::asyncCall<void>( + Manager::activities(), QStringLiteral("PreviousActivity")) + : + DBusFuture::fromVoid(); +} + +QFuture<void> Controller::nextActivity() +{ + return Manager::isServiceRunning() ? + DBusFuture::asyncCall<void>( + Manager::activities(), QStringLiteral("NextActivity")) + : + DBusFuture::fromVoid(); +} + } // namespace KActivities // #include "controller.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/src/lib/controller.h new/kactivities-5.68.0/src/lib/controller.h --- old/kactivities-5.67.0/src/lib/controller.h 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/src/lib/controller.h 2020-03-07 09:49:56.000000000 +0100 @@ -111,6 +111,16 @@ */ QFuture<void> startActivity(const QString &id); + /** + * Switches to the previous activity + */ + QFuture<void> previousActivity(); + + /** + * Switches to the next activity + */ + QFuture<void> nextActivity(); + private: // const QScopedPointer<ControllerPrivate> d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.67.0/src/lib/manager_p.cpp new/kactivities-5.68.0/src/lib/manager_p.cpp --- old/kactivities-5.67.0/src/lib/manager_p.cpp 2020-02-01 09:59:21.000000000 +0100 +++ new/kactivities-5.68.0/src/lib/manager_p.cpp 2020-03-07 09:49:56.000000000 +0100 @@ -81,7 +81,7 @@ auto reply = QDBusConnection::sessionBus().interface()->startService(KAMD_DBUS_SERVICE); if (!reply.isValid()) { //pre Plasma 5.12 the daemon did not support DBus activation. Fall back to manually forking - QProcess::startDetached(QStringLiteral("kactivitymanagerd")); + QProcess::startDetached(QStringLiteral("kactivitymanagerd"), QStringList()); } } }
