Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2021-09-16 23:13:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Thu Sep 16 23:13:46 2021 rev:94 rq:919171 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2021-08-16 10:11:14.307122973 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities5.new.1899/kactivities5.changes 2021-09-16 23:15:27.095846763 +0200 @@ -1,0 +2,14 @@ +Wed Sep 15 08:23:55 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Drop the unneeded baselibs.conf. + +------------------------------------------------------------------- +Mon Sep 6 06:21:51 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.86.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.86.0 +- No code change since 5.85.0 + +------------------------------------------------------------------- Old: ---- baselibs.conf kactivities-5.85.0.tar.xz kactivities-5.85.0.tar.xz.sig New: ---- kactivities-5.86.0.tar.xz kactivities-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.2FWoZl/_old 2021-09-16 23:15:27.615847301 +0200 +++ /var/tmp/diff_new_pack.2FWoZl/_new 2021-09-16 23:15:27.615847301 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Activities5 -%define _tar_path 5.85 +%define _tar_path 5.86 # 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.85.0 +Version: 5.86.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0-or-later @@ -36,7 +36,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/kactivities-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -Source99: baselibs.conf BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem ++++++ kactivities-5.85.0.tar.xz -> kactivities-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/.git-blame-ignore-revs new/kactivities-5.86.0/.git-blame-ignore-revs --- old/kactivities-5.85.0/.git-blame-ignore-revs 1970-01-01 01:00:00.000000000 +0100 +++ new/kactivities-5.86.0/.git-blame-ignore-revs 2021-09-04 17:40:48.000000000 +0200 @@ -0,0 +1,5 @@ +#clang-format/tidy +964b4dae478d9b7a03949718f18afa002286f433 +9b987f0e87a88896d549249577cce51ceb13a543 +e2abd678e4fc38552d3360759e4e47b02de0bf9d +07a6b88bbd4c74d0bae94111770ba5020def0fef diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/CMakeLists.txt new/kactivities-5.86.0/CMakeLists.txt --- old/kactivities-5.85.0/CMakeLists.txt 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/CMakeLists.txt 2021-09-04 17:40:48.000000000 +0200 @@ -3,14 +3,14 @@ cmake_minimum_required(VERSION 3.16) # KDE Frameworks -set(KF_VERSION "5.85.0") # handled by release scripts -set(KF_DEP_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts +set(KF_DEP_VERSION "5.86.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) option (KACTIVITIES_ENABLE_EXCEPTIONS "If you have Boost 1.53, you need to build KActivities with exceptions enabled. This is UNTESTED and EXPERIMENTAL!" OFF) -set (REQUIRED_QT_VERSION 5.15.0) +set (REQUIRED_QT_VERSION 5.15.2) # We don't build in-source if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") @@ -24,7 +24,7 @@ # Extra CMake stuff include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.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 @@ SOVERSION 5 ) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_subdirectory (src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/autotests/core/Process.cpp new/kactivities-5.86.0/autotests/core/Process.cpp --- old/kactivities-5.85.0/autotests/core/Process.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/autotests/core/Process.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -79,8 +79,9 @@ const auto dbus = QDBusConnection::sessionBus().interface(); const auto kamd = KAMD_DBUS_SERVICE; - if (!dbus->isServiceRegistered(kamd)) + if (!dbus->isServiceRegistered(kamd)) { break; + } uint pid = dbus->servicePid(kamd); // clang-format off diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/autotests/core/main.cpp new/kactivities-5.86.0/autotests/core/main.cpp --- old/kactivities-5.85.0/autotests/core/main.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/autotests/core/main.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -23,8 +23,9 @@ TestRunner &addTest(Test *test) { - if (m_nextToStart == 0) + if (m_nextToStart == 0) { m_tests << test; + } return *this; } @@ -36,8 +37,9 @@ void start() { - if (m_nextToStart) + if (m_nextToStart) { return; + } next(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/metainfo.yaml new/kactivities-5.86.0/metainfo.yaml --- old/kactivities-5.85.0/metainfo.yaml 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/metainfo.yaml 2021-09-04 17:40:48.000000000 +0200 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS note: Needs QtDBus portingAid: false deprecated: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/src/cli/main.cpp new/kactivities-5.86.0/src/cli/main.cpp --- old/kactivities-5.85.0/src/cli/main.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/src/cli/main.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -205,7 +205,7 @@ if (args.count() <= 1) { printHelp(); - } else + } else { for (int argId = 1; argId < args.count();) { if (args[argId] == QLatin1String("--help")) { printHelp(); @@ -237,6 +237,7 @@ argId++; } } + } delete controller; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/src/imports/activityinfo.cpp new/kactivities-5.86.0/src/imports/activityinfo.cpp --- old/kactivities-5.85.0/src/imports/activityinfo.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/src/imports/activityinfo.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -24,8 +24,9 @@ void ActivityInfo::setCurrentActivity(const QString &id) { - if (!m_showCurrentActivity) + if (!m_showCurrentActivity) { return; + } setIdInternal(id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/src/imports/activitymodel.cpp new/kactivities-5.86.0/src/imports/activitymodel.cpp --- old/kactivities-5.85.0/src/imports/activitymodel.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/src/imports/activitymodel.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -123,8 +123,9 @@ void settingsFileChanged(const QString &file) { - if (!file.endsWith(plasmaConfig.name())) + if (!file.endsWith(plasmaConfig.name())) { return; + } plasmaConfig.reparseConfiguration(); @@ -187,12 +188,14 @@ auto activityId = config.readEntry("activityId", QString()); // Ignore if it has no assigned activity - if (activityId.isEmpty()) + if (activityId.isEmpty()) { continue; + } // Ignore if we have already found the background - if (newBackgrounds.contains(activityId) && newBackgrounds[activityId][0] != QLatin1Char('#')) + if (newBackgrounds.contains(activityId) && newBackgrounds[activityId][0] != QLatin1Char('#')) { continue; + } auto newBackground = backgroundFromConfig(config); @@ -364,12 +367,14 @@ void ActivityModel::showActivity(InfoPtr activityInfo, bool notifyClients) { // Should it really be shown? - if (!Private::matchingState(activityInfo, m_shownStates)) + if (!Private::matchingState(activityInfo, m_shownStates)) { return; + } // Is it already shown? - if (boost::binary_search(m_shownActivities, activityInfo, InfoPtrComparator())) + if (boost::binary_search(m_shownActivities, activityInfo, InfoPtrComparator())) { return; + } auto registeredPosition = Private::activityPosition(m_knownActivities, activityInfo->id()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/src/imports/resourcemodel.cpp new/kactivities-5.86.0/src/imports/resourcemodel.cpp --- old/kactivities-5.85.0/src/imports/resourcemodel.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/src/imports/resourcemodel.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -543,7 +543,7 @@ QStringList result; - for (const auto &resource : qAsConst(resources)) { + for (const auto &resource : std::as_const(resources)) { result << resource.first; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/src/lib/activitiesmodel.cpp new/kactivities-5.86.0/src/lib/activitiesmodel.cpp --- old/kactivities-5.85.0/src/lib/activitiesmodel.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/src/lib/activitiesmodel.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -252,12 +252,14 @@ void ActivitiesModelPrivate::showActivity(InfoPtr activityInfo, bool notifyClients) { // Should it really be shown? - if (!Private::matchingState(activityInfo, shownStates)) + if (!Private::matchingState(activityInfo, shownStates)) { return; + } // Is it already shown? - if (std::binary_search(shownActivities.cbegin(), shownActivities.cend(), activityInfo, InfoPtrComparator())) + if (std::binary_search(shownActivities.cbegin(), shownActivities.cend(), activityInfo, InfoPtrComparator())) { return; + } auto registeredPosition = Private::activityPosition(knownActivities, activityInfo->id()); @@ -341,8 +343,9 @@ int ActivitiesModel::rowCount(const QModelIndex &parent) const { - if (parent.isValid()) + if (parent.isValid()) { return 0; + } return d->shownActivities.size(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/src/lib/consumer.cpp new/kactivities-5.86.0/src/lib/consumer.cpp --- old/kactivities-5.85.0/src/lib/consumer.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/src/lib/consumer.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -58,7 +58,7 @@ result.reserve(d->cache->m_activities.size()); - for (const auto &info : qAsConst(d->cache->m_activities)) { + for (const auto &info : std::as_const(d->cache->m_activities)) { if (info.state == state) { result << info.id; } @@ -73,7 +73,7 @@ result.reserve(d->cache->m_activities.size()); - for (const auto &info : qAsConst(d->cache->m_activities)) { + for (const auto &info : std::as_const(d->cache->m_activities)) { result << info.id; } @@ -86,7 +86,7 @@ result.reserve(d->cache->m_activities.size()); - for (const auto &info : qAsConst(d->cache->m_activities)) { + for (const auto &info : std::as_const(d->cache->m_activities)) { if (info.state == Info::Running || info.state == Info::Stopping) { result << info.id; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.85.0/src/lib/info.cpp new/kactivities-5.86.0/src/lib/info.cpp --- old/kactivities-5.85.0/src/lib/info.cpp 2021-07-15 00:26:52.000000000 +0200 +++ new/kactivities-5.86.0/src/lib/info.cpp 2021-09-04 17:40:48.000000000 +0200 @@ -144,13 +144,15 @@ Info::State Info::state() const { - if (d->cache->m_status == Consumer::Unknown) + if (d->cache->m_status == Consumer::Unknown) { return Info::Unknown; + } auto info = d->cache->getInfo(d->id); - if (!info) + if (!info) { return Info::Invalid; + } return static_cast<Info::State>(info->state); }
