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 2026-11-16 09:07:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-kservice (Old) and /work/SRC/openSUSE:Factory/.kf6-kservice.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kservice" Mon Nov 16 09:07:02 2026 rev:34 rq:1397445 version:6.32.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-kservice/kf6-kservice.changes 2026-10-11 15:18:35.997941838 +0200 +++ /work/SRC/openSUSE:Factory/.kf6-kservice.new.1251/kf6-kservice.changes 2026-11-16 09:10:22.501589796 +0100 @@ -1,0 +2,14 @@ +Sun Nov 8 10:36:24 UTC 2026 - Christophe Marin <[email protected]> + +- Update to 6.32.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.32.0 +- Changes since 6.31.0: + * Update dependency version to 6.32.0 + * Remove unimplemented methods + * Add cli test for KApplicationTrader + * Ensure consistent sorting of KServiceOffer (kde#525989) + * Update version to 6.32.0 + +------------------------------------------------------------------- Old: ---- kservice-6.31.0.tar.xz kservice-6.31.0.tar.xz.sig New: ---- kservice-6.32.0.tar.xz kservice-6.32.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-kservice.spec ++++++ --- /var/tmp/diff_new_pack.LLbUqO/_old 2026-11-16 09:10:23.370626230 +0100 +++ /var/tmp/diff_new_pack.LLbUqO/_new 2026-11-16 09:10:23.373626356 +0100 @@ -16,14 +16,14 @@ # -%define qt6_version 6.9.0 +%define qt6_version 6.10.0 %define rname kservice -# Full KF6 version (e.g. 6.31.0) +# Full KF6 version (e.g. 6.32.0) %{!?_kf6_version: %global _kf6_version %{version}} %bcond_without released Name: kf6-kservice -Version: 6.31.0 +Version: 6.32.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ kservice-6.31.0.tar.xz -> kservice-6.32.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/CMakeLists.txt new/kservice-6.32.0/CMakeLists.txt --- old/kservice-6.31.0/CMakeLists.txt 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/CMakeLists.txt 2026-11-07 16:27:27.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.30) -set(KF_VERSION "6.31.0") # handled by release scripts -set(KF_DEP_VERSION "6.31.0") # handled by release scripts +set(KF_VERSION "6.32.0") # handled by release scripts +set(KF_DEP_VERSION "6.32.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.31.0 NO_MODULE) +find_package(ECM 6.32.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/kservice-6.31.0/po/ia/kservice6.po new/kservice-6.32.0/po/ia/kservice6.po --- old/kservice-6.31.0/po/ia/kservice6.po 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/po/ia/kservice6.po 2026-11-07 16:27:27.000000000 +0100 @@ -4230,10 +4230,10 @@ #~ msgstr "Insimul de Characteres" #~ msgid "Repeats, Zero or More Times" -#~ msgstr "Repite, Zero o Multe Vices" +#~ msgstr "Repete, Zero o Multe Vices" #~ msgid "Repeats, One or More Times" -#~ msgstr "Il Repite, uno o multe Vices" +#~ msgstr "Il Repete, uno o multe Vices" #~ msgid "Optional" #~ msgstr "Optional" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/po/ru/kservice6.po new/kservice-6.32.0/po/ru/kservice6.po --- old/kservice-6.31.0/po/ru/kservice6.po 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/po/ru/kservice6.po 2026-11-07 16:27:27.000000000 +0100 @@ -64,7 +64,7 @@ #, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" -msgstr "© Разработчики KDE, 1999-2014" +msgstr "© Разработчики KDE, 1999–2014" #: kbuildsycoca/kbuildsycoca_main.cpp:95 #, kde-format @@ -88,7 +88,7 @@ #, kde-format msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" -msgstr "Отключить инкрементное обновление, перечитать все" +msgstr "Отключить инкрементное обновление, перечитать всё" #: kbuildsycoca/kbuildsycoca_main.cpp:103 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/src/services/kmimetypefactory_p.h new/kservice-6.32.0/src/services/kmimetypefactory_p.h --- old/kservice-6.31.0/src/services/kmimetypefactory_p.h 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/src/services/kmimetypefactory_p.h 2026-11-07 16:27:27.000000000 +0100 @@ -66,11 +66,6 @@ */ QStringList allMimeTypes(); - /*! - * Returns the unique MIME type factory, creating it if necessary - */ - static KMimeTypeFactory *self(); - public: // public for KBuildServiceFactory // A small entry for each MIME type with name and offset into the services-offer-list. class MimeTypeEntryPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/src/services/kservicefactory_p.h new/kservice-6.32.0/src/services/kservicefactory_p.h --- old/kservice-6.31.0/src/services/kservicefactory_p.h 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/src/services/kservicefactory_p.h 2026-11-07 16:27:27.000000000 +0100 @@ -98,11 +98,6 @@ */ static QStringList resourceDirs(); - /*! - * @return the unique service factory, creating it if necessary - */ - static KServiceFactory *self(); - protected: KService *createEntry(int offset) const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/src/services/kservicegroupfactory_p.h new/kservice-6.32.0/src/services/kservicegroupfactory_p.h --- old/kservice-6.31.0/src/services/kservicegroupfactory_p.h 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/src/services/kservicegroupfactory_p.h 2026-11-07 16:27:27.000000000 +0100 @@ -51,11 +51,6 @@ */ KServiceGroup::Ptr findBaseGroup(const QString &_baseGroupName, bool deep = true); - /*! - * @return the unique service group factory, creating it if necessary - */ - static KServiceGroupFactory *self(); - protected: KServiceGroup *createGroup(int offset, bool deep) const; KServiceGroup *createEntry(int offset) const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/src/services/kserviceoffer.cpp new/kservice-6.32.0/src/services/kserviceoffer.cpp --- old/kservice-6.31.0/src/services/kserviceoffer.cpp 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/src/services/kserviceoffer.cpp 2026-11-07 16:27:27.000000000 +0100 @@ -65,9 +65,14 @@ return d->mimeTypeInheritanceLevel < _o.d->mimeTypeInheritanceLevel; } - // Finally, use preference to sort them + // use preference to sort them // The bigger the better, but we want the better FIRST - return _o.d->preference < d->preference; + if (_o.d->preference != d->preference) { + return _o.d->preference < d->preference; + } + + // if the above is all equal, use storageId as last sorting + return service()->storageId() < _o.service()->storageId(); } int KServiceOffer::preference() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/src/sycoca/kbuildsycoca_p.h new/kservice-6.32.0/src/sycoca/kbuildsycoca_p.h --- old/kservice-6.31.0/src/sycoca/kbuildsycoca_p.h 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/src/sycoca/kbuildsycoca_p.h 2026-11-07 16:27:27.000000000 +0100 @@ -99,11 +99,6 @@ KSERVICE_NO_EXPORT void save(QDataStream *str); /*! - * Clear the factories - */ - KSERVICE_NO_EXPORT void clear(); - - /*! * \internal * Returns true if building (i.e. if a KBuildSycoca); */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/src/sycoca/vfolder_menu_p.h new/kservice-6.32.0/src/sycoca/vfolder_menu_p.h --- old/kservice-6.31.0/src/sycoca/vfolder_menu_p.h 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/src/sycoca/vfolder_menu_p.h 2026-11-07 16:27:27.000000000 +0100 @@ -148,11 +148,6 @@ KService::Ptr findApplication(const QString &relPath); /*! - * Lookup applications by category - */ - QList<KService::List *> findCategory(const QString &category); - - /*! * Add new application */ void addApplication(const QString &id, KService::Ptr service); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/tests/CMakeLists.txt new/kservice-6.32.0/tests/CMakeLists.txt --- old/kservice-6.31.0/tests/CMakeLists.txt 2026-10-02 15:21:29.000000000 +0200 +++ new/kservice-6.32.0/tests/CMakeLists.txt 2026-11-07 16:27:27.000000000 +0100 @@ -13,6 +13,7 @@ kservice_executable_tests( kservicegroup_dumper findservice + ktraderclient ) add_executable(kmimeassociations_dumper) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.31.0/tests/ktraderclient.cpp new/kservice-6.32.0/tests/ktraderclient.cpp --- old/kservice-6.31.0/tests/ktraderclient.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-6.32.0/tests/ktraderclient.cpp 2026-11-07 16:27:27.000000000 +0100 @@ -0,0 +1,36 @@ +/* + * SPDX-FileCopyrightText: 2026 Nicolas Fella <[email protected]> + * + * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL + */ + +#include <QCommandLineParser> + +#include <KApplicationTrader> + +using namespace Qt::Literals; + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + + QCommandLineParser parser; + parser.addPositionalArgument(u"mimetype"_s, u"The MIME type"_s); + parser.addOption(QCommandLineOption(u"preferred"_s, u"List only the preferred service"_s)); + + parser.process(app); + + if (parser.positionalArguments().length() != 1) { + parser.showHelp(); + } + + if (parser.isSet(u"preferred"_s)) { + const auto service = KApplicationTrader::preferredService(parser.positionalArguments().first()); + QTextStream(stdout) << service->desktopEntryName() << Qt::endl; + } else { + const auto list = KApplicationTrader::queryByMimeType(parser.positionalArguments().first()); + for (const auto &service : list) { + QTextStream(stdout) << service->desktopEntryName() << Qt::endl; + } + } +}
