Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2022-08-15 19:57:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Mon Aug 15 19:57:01 2022 rev:105 rq:994948 version:5.97.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2022-07-11 19:09:30.543618489 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities5.new.1521/kactivities5.changes 2022-08-15 19:58:58.453186261 +0200 @@ -1,0 +2,12 @@ +Sun Aug 7 22:27:09 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.97.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.97.0 +- Changes since 5.96.0: + * Utilize std::optional instead of custom impl + * Remove debug message for Consumer destructor + * Do not enable debug output for debug QT builds + +------------------------------------------------------------------- Old: ---- kactivities-5.96.0.tar.xz kactivities-5.96.0.tar.xz.sig New: ---- kactivities-5.97.0.tar.xz kactivities-5.97.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.K16Ckz/_old 2022-08-15 19:58:58.885187466 +0200 +++ /var/tmp/diff_new_pack.K16Ckz/_new 2022-08-15 19:58:58.889187478 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Activities5 -%define _tar_path 5.96 +%define _tar_path 5.97 # 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 released Name: kactivities5 -Version: 5.96.0 +Version: 5.97.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0-or-later ++++++ kactivities-5.96.0.tar.xz -> kactivities-5.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.96.0/CMakeLists.txt new/kactivities-5.97.0/CMakeLists.txt --- old/kactivities-5.96.0/CMakeLists.txt 2022-07-02 16:28:48.000000000 +0200 +++ new/kactivities-5.97.0/CMakeLists.txt 2022-08-07 14:13:34.000000000 +0200 @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.16) # KDE Frameworks -set(KF_VERSION "5.96.0") # handled by release scripts -set(KF_DEP_VERSION "5.96.0") # handled by release scripts +set(KF_VERSION "5.97.0") # handled by release scripts +set(KF_DEP_VERSION "5.97.0") # handled by release scripts project (KActivities VERSION ${KF_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.96.0 NO_MODULE) +find_package(ECM 5.97.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.96.0/src/CMakeLists.txt new/kactivities-5.97.0/src/CMakeLists.txt --- old/kactivities-5.96.0/src/CMakeLists.txt 2022-07-02 16:28:48.000000000 +0200 +++ new/kactivities-5.97.0/src/CMakeLists.txt 2022-08-07 14:13:34.000000000 +0200 @@ -32,7 +32,6 @@ include_directories ( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${Boost_INCLUDE_DIRS} ) add_subdirectory (imports) endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.96.0/src/imports/CMakeLists.txt new/kactivities-5.97.0/src/imports/CMakeLists.txt --- old/kactivities-5.96.0/src/imports/CMakeLists.txt 2022-07-02 16:28:48.000000000 +0200 +++ new/kactivities-5.97.0/src/imports/CMakeLists.txt 2022-08-07 14:13:34.000000000 +0200 @@ -29,6 +29,7 @@ KF5::Activities KF5::ConfigCore KF5::CoreAddons + Boost::headers ) ecm_finalize_qml_module(kactivitiesextensionplugin DESTINATION ${KDE_INSTALL_QMLDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.96.0/src/lib/consumer.cpp new/kactivities-5.97.0/src/lib/consumer.cpp --- old/kactivities-5.96.0/src/lib/consumer.cpp 2022-07-02 16:28:48.000000000 +0200 +++ new/kactivities-5.97.0/src/lib/consumer.cpp 2022-08-07 14:13:34.000000000 +0200 @@ -8,8 +8,6 @@ #include "consumer_p.h" #include "manager_p.h" -#include "debug_p.h" - namespace KActivities { ConsumerPrivate::ConsumerPrivate() @@ -42,10 +40,7 @@ // this, SIGNAL(activityStateChanged(QString,int))); } -Consumer::~Consumer() -{ - qCDebug(KAMD_CORELIB) << "Killing the consumer"; -} +Consumer::~Consumer() = default; QString Consumer::currentActivity() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.96.0/src/lib/manager_p.cpp new/kactivities-5.97.0/src/lib/manager_p.cpp --- old/kactivities-5.96.0/src/lib/manager_p.cpp 2022-07-02 16:28:48.000000000 +0200 +++ new/kactivities-5.97.0/src/lib/manager_p.cpp 2022-08-07 14:13:34.000000000 +0200 @@ -7,6 +7,7 @@ #include "manager_p.h" #include <mutex> +#include <optional> #include <QCoreApplication> #include <QDBusConnection> @@ -46,9 +47,6 @@ { static std::mutex singleton; std::lock_guard<std::mutex> singleton_lock(singleton); -#if defined(QT_DEBUG) - QLoggingCategory::setFilterRules(QStringLiteral("kf.activities.debug=true")); -#endif if (!s_instance) { runInMainThread([]() { @@ -90,11 +88,11 @@ if (m_serviceRunning) { using namespace kamd::utils; - continue_with(DBusFuture::fromReply(m_service->serviceVersion()), [this](const optional_view<QString> &serviceVersion) { + continue_with(DBusFuture::fromReply(m_service->serviceVersion()), [this](const std::optional<QString> &serviceVersion) { // Test whether the service is older than the library. // If it is, we need to end this - if (!serviceVersion.is_initialized()) { + if (!serviceVersion.has_value()) { qWarning() << "KActivities: FATAL ERROR: Failed to contact the activity manager daemon"; m_serviceRunning = false; return; @@ -116,7 +114,7 @@ QString libraryVersion = QString::number(requiredVersion[0]) + QLatin1Char('.') + QString::number(requiredVersion[1]) + QLatin1Char('.') + QString::number(requiredVersion[2]); - qDebug() << "KActivities service version: " << serviceVersion.get(); + qDebug() << "KActivities service version: " << serviceVersion.value(); qDebug() << "KActivities library version: " << libraryVersion; qFatal("KActivities: FATAL ERROR: The service is older than the library"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.96.0/src/utils/continue_with.h new/kactivities-5.97.0/src/utils/continue_with.h --- old/kactivities-5.96.0/src/utils/continue_with.h 2022-07-02 16:28:48.000000000 +0200 +++ new/kactivities-5.97.0/src/utils/continue_with.h 2022-08-07 14:13:34.000000000 +0200 @@ -11,8 +11,7 @@ #include <QFuture> #include <QFutureWatcher> -#include "utils/optional_view.h" -// #include <boost/optional.hpp> +#include <optional> #ifdef ENABLE_QJSVALUE_CONTINUATION #include <QJSValue> @@ -61,7 +60,7 @@ inline void pass_value(const QFuture<_ReturnType> &future, _Continuation &&continuation) { using namespace kamd::utils; - continuation(future.resultCount() > 0 ? make_optional_view(future.result()) : none()); + continuation(future.resultCount() > 0 ? std::optional(future.result()) : std::nullopt); } template<typename _Continuation> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.96.0/src/utils/optional_view.h new/kactivities-5.97.0/src/utils/optional_view.h --- old/kactivities-5.96.0/src/utils/optional_view.h 2022-07-02 16:28:48.000000000 +0200 +++ new/kactivities-5.97.0/src/utils/optional_view.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -/* - SPDX-FileCopyrightText: 2012-2016 Ivan Cukic <ivan.cukic(at)kde.org> - - SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL -*/ - -#ifndef UTILS_OPTIONAL_VIEW_H -#define UTILS_OPTIONAL_VIEW_H - -namespace kamd -{ -namespace utils -{ -struct none_t { -}; -inline const none_t none() -{ - return none_t(); -} - -// A simple implementation of the optional class -// until we can rely on std::optional. -// It is not going to come close in the supported -// features to the std one. -// (we need it in the core library, so we don't -// want to use boost.optional) -template<typename T> -class optional_view -{ -public: - explicit optional_view(const T &value) - : m_value(&value) - { - } - - optional_view(const none_t &) - : m_value(nullptr) - { - } - - bool is_initialized() const - { - return m_value != nullptr; - } - - const T &get() const - { - return *m_value; - } - - const T *operator->() const - { - return m_value; - } - -private: - const T *const m_value; -}; - -template<typename T> -optional_view<T> make_optional_view(const T &value) -{ - return optional_view<T>(value); -} - -} // namespace utils -} // namespace kamd - -#endif // UTILS_OPTIONAL_VIEW_H
