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-08-17 16:57:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-kservice (Old) and /work/SRC/openSUSE:Factory/.kf6-kservice.new.1258 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kservice" Mon Aug 17 16:57:08 2026 rev:31 rq:1371403 version:6.29.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-kservice/kf6-kservice.changes 2026-07-15 16:40:21.815952253 +0200 +++ /work/SRC/openSUSE:Factory/.kf6-kservice.new.1258/kf6-kservice.changes 2026-08-17 17:00:27.518139529 +0200 @@ -1,0 +2,16 @@ +Sun Aug 9 10:38:44 UTC 2026 - Christophe Marin <[email protected]> + +- Update to 6.29.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.29.0 +- Changes since 6.28.0: + * Update dependency version to 6.29.0 + * Deprecate KSycoca::setupTestMenu + * Fix static build by exporting resource targets + * Remove LegacyDir from fallback applications.menu + * Add fallback applications.menu file + * ksycocatype.h: provide version macros to consumers + * Update version to 6.29.0 + +------------------------------------------------------------------- Old: ---- kservice-6.28.0.tar.xz kservice-6.28.0.tar.xz.sig New: ---- kservice-6.29.0.tar.xz kservice-6.29.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-kservice.spec ++++++ --- /var/tmp/diff_new_pack.T11MIU/_old 2026-08-17 17:00:28.453172566 +0200 +++ /var/tmp/diff_new_pack.T11MIU/_new 2026-08-17 17:00:28.455172636 +0200 @@ -19,11 +19,11 @@ %define qt6_version 6.9.0 %define rname kservice -# Full KF6 version (e.g. 6.28.0) +# Full KF6 version (e.g. 6.29.0) %{!?_kf6_version: %global _kf6_version %{version}} %bcond_without released Name: kf6-kservice -Version: 6.28.0 +Version: 6.29.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ kservice-6.28.0.tar.xz -> kservice-6.29.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/CMakeLists.txt new/kservice-6.29.0/CMakeLists.txt --- old/kservice-6.28.0/CMakeLists.txt 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/CMakeLists.txt 2026-08-07 22:42:38.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.29) -set(KF_VERSION "6.28.0") # handled by release scripts -set(KF_DEP_VERSION "6.28.0") # handled by release scripts +set(KF_VERSION "6.29.0") # handled by release scripts +set(KF_DEP_VERSION "6.29.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.28.0 NO_MODULE) +find_package(ECM 6.29.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.28.0/autotests/ksycocatest.cpp new/kservice-6.29.0/autotests/ksycocatest.cpp --- old/kservice-6.28.0/autotests/ksycocatest.cpp 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/autotests/ksycocatest.cpp 2026-08-07 22:42:38.000000000 +0200 @@ -73,6 +73,7 @@ void testDeletingSycoca(); void testNonReadableSycoca(); void extraFileInFutureShouldRebuildSycocaOnce(); + void testNoMenuFile(); private: void createTestApp() @@ -321,4 +322,15 @@ QVERIFY(QFile::remove(path)); } +void KSycocaTest::testNoMenuFile() +{ + // remove the menu file to force using the fallback + qunsetenv("XDG_MENU_PREFIX"); + const QString file = menusDir() + QLatin1String("/applications.menu"); + QFile::remove(file); + + KBuildSycoca builder; + QVERIFY(builder.recreate()); +} + #include "ksycocatest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/po/cs/kservice6.po new/kservice-6.29.0/po/cs/kservice6.po --- old/kservice-6.28.0/po/cs/kservice6.po 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/po/cs/kservice6.po 2026-08-07 22:42:39.000000000 +0200 @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 22.12.2\n" +"X-Generator: Poedit 3.9\n" "X-Language: cs_CZ\n" "X-Source-Language: en_US\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/po/de/kservice6.po new/kservice-6.29.0/po/de/kservice6.po --- old/kservice-6.28.0/po/de/kservice6.po 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/po/de/kservice6.po 2026-08-07 22:42:39.000000000 +0200 @@ -1,11 +1,11 @@ -# SPDX-FileCopyrightText: 2002, 2003, 2004, 2005 Thomas Diehl <[email protected]> +# SPDX-FileCopyrightText: 2002-2005 Thomas Diehl <[email protected]> # SPDX-FileCopyrightText: 2004 Stefan Winter <[email protected]> # SPDX-FileCopyrightText: 2004 Thomas Fischer <[email protected]> -# SPDX-FileCopyrightText: 2004, 2005, 2006, 2007 Stephan Johach <[email protected]> +# SPDX-FileCopyrightText: 2004-2007 Stephan Johach <[email protected]> # SPDX-FileCopyrightText: 2005 Georg Schuster <[email protected]> -# SPDX-FileCopyrightText: 2005, 2006, 2007, 2008, 2009 Thomas Reitelbach <[email protected]> -# SPDX-FileCopyrightText: 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2021 Burkhard Lück <[email protected]> -# SPDX-FileCopyrightText: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Frederik Schwarzer <[email protected]> +# SPDX-FileCopyrightText: 2005-2009 Thomas Reitelbach <[email protected]> +# SPDX-FileCopyrightText: 2006-2007, 2009-2015, 2021 Burkhard Lück <[email protected]> +# SPDX-FileCopyrightText: 2007-2013 Frederik Schwarzer <[email protected]> # SPDX-FileCopyrightText: 2010 Johannes Obermayr <[email protected]> # SPDX-FileCopyrightText: 2010 Panagiotis Papadopoulos <[email protected]> # SPDX-FileCopyrightText: 2012 Rolf Eike Beer <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/src/CMakeLists.txt new/kservice-6.29.0/src/CMakeLists.txt --- old/kservice-6.28.0/src/CMakeLists.txt 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/src/CMakeLists.txt 2026-08-07 22:42:39.000000000 +0200 @@ -60,7 +60,7 @@ VERSION ${KF_VERSION} USE_VERSION_HEADER DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.90 + DEPRECATION_VERSIONS 5.90 6.29 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) @@ -87,6 +87,8 @@ KF6::CoreAddons # KShell ) +qt_add_resources(KF6Service "fallback-menu" PREFIX "/org.kde.kservice" FILES fallback-applications.menu OUTPUT_TARGETS KService_RESOURCE_TARGETS) + ecm_generate_headers(KService_HEADERS HEADER_NAMES KSycoca @@ -107,7 +109,7 @@ ecm_generate_qdoc(KF6Service kservice.qdocconf) -install(TARGETS KF6Service EXPORT KF6ServiceTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KF6Service ${KService_RESOURCE_TARGETS} EXPORT KF6ServiceTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kservice_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/src/fallback-applications.menu new/kservice-6.29.0/src/fallback-applications.menu --- old/kservice-6.28.0/src/fallback-applications.menu 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-6.29.0/src/fallback-applications.menu 2026-08-07 22:42:39.000000000 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd";> +<Menu> + <Name>Applications</Name> + <Directory>Applications.directory</Directory> + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + <MergeDir>applications-merged</MergeDir> + <DefaultLayout> + <Merge type="menus"/> + <Merge type="files"/> + </DefaultLayout> +</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/src/sycoca/ksycoca.cpp new/kservice-6.29.0/src/sycoca/ksycoca.cpp --- old/kservice-6.28.0/src/sycoca/ksycoca.cpp 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/src/sycoca/ksycoca.cpp 2026-08-07 22:42:39.000000000 +0200 @@ -801,6 +801,7 @@ d->closeDatabase(); } +#if KSERVICE_BUILD_DEPRECATED_SINCE(6, 29) void KSycoca::setupTestMenu() { const QByteArray content = R"(<?xml version="1.0"?> @@ -827,5 +828,6 @@ output.open(QIODevice::ReadWrite | QIODevice::Truncate); output.write(content); } +#endif #include "moc_ksycoca.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/src/sycoca/ksycoca.h new/kservice-6.29.0/src/sycoca/ksycoca.h --- old/kservice-6.28.0/src/sycoca/ksycoca.h 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/src/sycoca/ksycoca.h 2026-08-07 22:42:39.000000000 +0200 @@ -152,6 +152,7 @@ */ void ensureCacheValid(); // Warning for kservice code: this can delete all the factories. +#if KSERVICE_ENABLE_DEPRECATED_SINCE(6, 29) /*! * Sets up a minimal applications.menu file in the appropriate location. * @@ -159,9 +160,13 @@ * * You should call QStandardPaths::setTestModeEnabled(true) before calling this. * + * \deprecated[6.29] Unused + * * \since 6.0 */ + KSERVICE_DEPRECATED_VERSION(6, 29, "Unused") static void setupTestMenu(); +#endif /*! * Connect to this to get notified when the database changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/src/sycoca/ksycocatype.h new/kservice-6.29.0/src/sycoca/ksycocatype.h --- old/kservice-6.28.0/src/sycoca/ksycocatype.h 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/src/sycoca/ksycocatype.h 2026-08-07 22:42:39.000000000 +0200 @@ -9,6 +9,11 @@ #ifndef KSYCOCATYPE_H #define KSYCOCATYPE_H +// All KF6 public headers should provide the version macros. +// Include version header explicitly because the export header +// (which usually takes care of that) isn't used here +#include <kservice_version.h> // IWYU pragma: export + /* * A KSycocaType is a code (out of the KSycocaType enum) assigned to each * class type derived from KSycocaEntry . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-6.28.0/src/sycoca/vfolder_menu.cpp new/kservice-6.29.0/src/sycoca/vfolder_menu.cpp --- old/kservice-6.28.0/src/sycoca/vfolder_menu.cpp 2026-07-03 12:59:45.000000000 +0200 +++ new/kservice-6.29.0/src/sycoca/vfolder_menu.cpp 2026-08-07 22:42:39.000000000 +0200 @@ -19,6 +19,8 @@ #include <QMap> #include <QStandardPaths> +using namespace Qt::Literals; + static void foldNode(QDomElement &docElem, QDomElement &e, QMap<QString, QDomElement> &dupeList, QString s = QString()) // krazy:exclude=passbyvalue { if (s.isEmpty()) { @@ -664,9 +666,8 @@ m_docInfo.path = locateMenuFile(fileName); if (m_docInfo.path.isEmpty()) { - m_docInfo.baseDir.clear(); - m_docInfo.baseName.clear(); - qCDebug(SYCOCA) << "Menu" << fileName << "not found."; + qCDebug(SYCOCA) << fileName << "not found in" << m_allDirectories << "falling back to built-in file"; + m_docInfo.path = u":/org.kde.kservice/fallback-applications.menu"_s; return; } qCDebug(SYCOCA) << "Found menu file" << m_docInfo.path; @@ -782,17 +783,15 @@ return; } + Q_ASSERT(m_docInfo.path.isEmpty()); + pushDocInfo(fileName); m_defaultMergeDirs << QStringLiteral("applications-merged/"); m_doc = loadDoc(); popDocInfo(); if (m_doc.isNull()) { - if (m_docInfo.path.isEmpty()) { - qCritical() << fileName << " not found in " << m_allDirectories; - } else { - qCWarning(SYCOCA) << "Load error (" << m_docInfo.path << ")"; - } + qCWarning(SYCOCA) << "Load error (" << m_docInfo.path << ")"; return; }
