Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2018-01-09 14:39:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Tue Jan 9 14:39:26 2018 rev:48 rq:559417 version:5.41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2017-11-16 14:36:29.432512080 +0100 +++ /work/SRC/openSUSE:Factory/.kactivities5.new/kactivities5.changes 2018-01-09 14:41:13.669465192 +0100 @@ -1,0 +2,12 @@ +Sun Dec 17 09:43:47 CET 2017 - [email protected] + +- Update to 5.41.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.41.0.php +- Changes since 5.40.0: + * Qt5Core is required. + * Fix race that starts kactivitymanagerd multiple times + * Remove code duplication + +------------------------------------------------------------------- Old: ---- kactivities-5.40.0.tar.xz New: ---- kactivities-5.41.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.8c769m/_old 2018-01-09 14:41:14.281436490 +0100 +++ /var/tmp/diff_new_pack.8c769m/_new 2018-01-09 14:41:14.285436304 +0100 @@ -17,13 +17,13 @@ %define lname libKF5Activities5 -%define _tar_path 5.40 +%define _tar_path 5.41 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kactivities5 -Version: 5.40.0 +Version: 5.41.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0+ ++++++ kactivities-5.40.0.tar.xz -> kactivities-5.41.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.40.0/CMakeLists.txt new/kactivities-5.41.0/CMakeLists.txt --- old/kactivities-5.40.0/CMakeLists.txt 2017-11-04 22:36:01.000000000 +0100 +++ new/kactivities-5.41.0/CMakeLists.txt 2017-12-02 10:53:17.000000000 +0100 @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.0) # KDE Frameworks -set(KF5_VERSION "5.40.0") # handled by release scripts -set(KF5_DEP_VERSION "5.40.0") # handled by release scripts +set(KF5_VERSION "5.41.0") # handled by release scripts +set(KF5_DEP_VERSION "5.41.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.40.0 NO_MODULE) +find_package(ECM 5.41.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.40.0/src/lib/libKActivities.pc.cmake new/kactivities-5.41.0/src/lib/libKActivities.pc.cmake --- old/kactivities-5.40.0/src/lib/libKActivities.pc.cmake 2017-11-04 22:36:01.000000000 +0100 +++ new/kactivities-5.41.0/src/lib/libKActivities.pc.cmake 2017-12-02 10:53:17.000000000 +0100 @@ -6,7 +6,7 @@ Name: libKActivities Description: libKActivities is a C++ library for using KDE activities URL: http://www.kde.org -Requires: +Requires: Qt5Core Version: ${KACTIVITIES_LIB_VERSION_STRING} Libs: -L${LIB_INSTALL_DIR} -lKF5Activities Cflags: -I${INCLUDE_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.40.0/src/lib/manager_p.cpp new/kactivities-5.41.0/src/lib/manager_p.cpp --- old/kactivities-5.40.0/src/lib/manager_p.cpp 2017-11-04 22:36:01.000000000 +0100 +++ new/kactivities-5.41.0/src/lib/manager_p.cpp 2017-12-02 10:53:17.000000000 +0100 @@ -62,27 +62,27 @@ { static std::mutex singleton; std::lock_guard<std::mutex> singleton_lock(singleton); + #if defined(QT_DEBUG) + QLoggingCategory::setFilterRules(QStringLiteral("org.kde.kactivities.lib.core.debug=true")); + #endif if (!s_instance) { runInMainThread([] () { + // check if the activity manager is already running if (!Manager::isServiceRunning()) { - - #if defined(QT_DEBUG) - QLoggingCategory::setFilterRules(QStringLiteral("org.kde.kactivities.lib.core.debug=true")); + bool disableAutolaunch = QCoreApplication::instance()->property("org.kde.KActivities.core.disableAutostart").toBool(); qCDebug(KAMD_CORELIB) << "Should we start the daemon?"; - if (!QCoreApplication::instance() - ->property("org.kde.KActivities.core.disableAutostart") - .toBool()) { + if (!disableAutolaunch) { qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon"; - QProcess::startDetached(QStringLiteral("kactivitymanagerd")); + 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")); + } } - - #else - QProcess::startDetached(QStringLiteral("kactivitymanagerd")); - #endif } // creating a new instance of the class
