Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-kservice for openSUSE:Factory checked in at 2025-05-12 16:44:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-kservice (Old) and /work/SRC/openSUSE:Factory/.kf6-kservice.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kservice" Mon May 12 16:44:33 2025 rev:15 rq:1276395 version:6.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-kservice/kf6-kservice.changes 2025-04-15 16:46:47.129313661 +0200 +++ /work/SRC/openSUSE:Factory/.kf6-kservice.new.30101/kf6-kservice.changes 2025-05-12 16:47:31.313254596 +0200 @@ -1,0 +2,12 @@ +Sun May 4 19:05:29 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 6.14.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.14.0 +- Changes since 6.13.0: + * Update dependency version to 6.14.0 + * kservice: refactor parseActions to limit block depth + * Update version to 6.14.0 + +------------------------------------------------------------------- Old: ---- kservice-6.13.0.tar.xz kservice-6.13.0.tar.xz.sig New: ---- kservice-6.14.0.tar.xz kservice-6.14.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-kservice.spec ++++++ --- /var/tmp/diff_new_pack.wPFYP2/_old 2025-05-12 16:47:31.881278413 +0200 +++ /var/tmp/diff_new_pack.wPFYP2/_new 2025-05-12 16:47:31.885278581 +0200 @@ -19,13 +19,13 @@ %define qt6_version 6.7.0 %define rname kservice -# Full KF6 version (e.g. 6.13.0) +# Full KF6 version (e.g. 6.14.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-kservice -Version: 6.13.0 +Version: 6.14.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ kservice-6.13.0.tar.xz -> kservice-6.14.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.13.0/CMakeLists.txt new/kservice-6.14.0/CMakeLists.txt --- old/kservice-6.13.0/CMakeLists.txt 2025-04-04 16:02:53.000000000 +0200 +++ new/kservice-6.14.0/CMakeLists.txt 2025-05-02 16:24:17.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.13.0") # handled by release scripts -set(KF_DEP_VERSION "6.13.0") # handled by release scripts +set(KF_VERSION "6.14.0") # handled by release scripts +set(KF_DEP_VERSION "6.14.0") # handled by release scripts project(KService VERSION ${KF_VERSION}) # Disallow in-source build @@ -11,7 +11,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 6.13.0 NO_MODULE) +find_package(ECM 6.14.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) @@ -41,7 +41,7 @@ SOVERSION 6) # Dependencies -set(REQUIRED_QT_VERSION 6.6.0) +set(REQUIRED_QT_VERSION 6.7.0) find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) find_package(KF6Config ${KF_DEP_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.13.0/src/services/kservice.cpp new/kservice-6.14.0/src/services/kservice.cpp --- old/kservice-6.13.0/src/services/kservice.cpp 2025-04-04 16:02:53.000000000 +0200 +++ new/kservice-6.14.0/src/services/kservice.cpp 2025-05-02 16:24:17.000000000 +0200 @@ -181,34 +181,36 @@ continue; } - if (config->hasActionGroup(group)) { - const KConfigGroup cg = config->actionGroup(group); - if (!cg.hasKey("Name")) { - qCWarning(SERVICES) << "The action" << group << "in the desktop file" << q->entryPath() << "has no Name key"; - } else if (!cg.hasKey("Exec") && !config->desktopGroup().readEntry("DBusActivatable", false)) { - qCWarning(SERVICES) << "The action" << group << "in the desktop file" << q->entryPath() << "has no Exec key and not D-Bus activatable"; - } else { - const QMap<QString, QString> entries = cg.entryMap(); - - QVariantMap entriesVariants; - - for (auto it = entries.constKeyValueBegin(); it != entries.constKeyValueEnd(); ++it) { - // Those are stored separately - if (it->first == QLatin1String("Name") || it->first == QLatin1String("Icon") || it->first == QLatin1String("Exec") - || it->first == QLatin1String("NoDisplay")) { - continue; - } - - entriesVariants.insert(it->first, it->second); - } - - KServiceAction action(group, cg.readEntry("Name"), cg.readEntry("Icon"), cg.readEntry("Exec"), cg.readEntry("NoDisplay", false), serviceClone); - action.setData(QVariant::fromValue(entriesVariants)); - m_actions.append(action); - } - } else { + if (!config->hasActionGroup(group)) { qCWarning(SERVICES) << "The desktop file" << q->entryPath() << "references the action" << group << "but doesn't define it"; + continue; } + + const KConfigGroup cg = config->actionGroup(group); + if (!cg.hasKey("Name")) { + qCWarning(SERVICES) << "The action" << group << "in the desktop file" << q->entryPath() << "has no Name key"; + continue; + } + + if (!cg.hasKey("Exec") && !config->desktopGroup().readEntry("DBusActivatable", false)) { + qCWarning(SERVICES) << "The action" << group << "in the desktop file" << q->entryPath() << "has no Exec key and not D-Bus activatable"; + continue; + } + + const QMap<QString, QString> entries = cg.entryMap(); + QVariantMap entriesVariants; + for (const auto &[key, value] : entries.asKeyValueRange()) { + // Those are stored separately + if (key == QLatin1String("Name") || key == QLatin1String("Icon") || key == QLatin1String("Exec") || key == QLatin1String("NoDisplay")) { + continue; + } + + entriesVariants.insert(key, value); + } + + KServiceAction action(group, cg.readEntry("Name"), cg.readEntry("Icon"), cg.readEntry("Exec"), cg.readEntry("NoDisplay", false), serviceClone); + action.setData(QVariant::fromValue(entriesVariants)); + m_actions.append(action); } serviceClone->setActions(m_actions);
