Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kded for openSUSE:Factory checked in at 2021-11-15 15:25:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kded (Old) and /work/SRC/openSUSE:Factory/.kded.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kded" Mon Nov 15 15:25:06 2021 rev:98 rq:931076 version:5.88.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kded/kded.changes 2021-10-18 22:00:13.546008221 +0200 +++ /work/SRC/openSUSE:Factory/.kded.new.1890/kded.changes 2021-11-15 15:26:16.609821422 +0100 @@ -1,0 +2,18 @@ +Sun Nov 7 09:13:16 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Strip 'Source' URL for faster submissions + +------------------------------------------------------------------- +Sun Nov 7 09:07:58 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.88.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.88.0 +- Changes since 5.87.0: + * Bump KF_DISABLE_DEPRECATED_BEFORE_AND_AT value + * Port away from deprecated KPluginLoader + * Utilize KPluginMetaData::value overloads + * Add FreeBSD CI + +------------------------------------------------------------------- Old: ---- kded-5.87.0.tar.xz kded-5.87.0.tar.xz.sig New: ---- kded-5.88.0.tar.xz kded-5.88.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.imBHXf/_old 2021-11-15 15:26:17.313821619 +0100 +++ /var/tmp/diff_new_pack.imBHXf/_new 2021-11-15 15:26:17.317821620 +0100 @@ -16,22 +16,22 @@ # -%define _tar_path 5.87 +%define _tar_path 5.88 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kded -Version: 5.87.0 +Version: 5.88.0 Release: 0 Summary: Central daemon of KDE workspaces License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif # PATCH-FIX-OPENSUSE (for now mostly to get openQA's opinion) ++++++ kded-5.87.0.tar.xz -> kded-5.88.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.87.0/.gitlab-ci.yml new/kded-5.88.0/.gitlab-ci.yml --- old/kded-5.87.0/.gitlab-ci.yml 2021-10-02 16:25:14.000000000 +0200 +++ new/kded-5.88.0/.gitlab-ci.yml 2021-11-06 14:17:09.000000000 +0100 @@ -3,3 +3,4 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.87.0/CMakeLists.txt new/kded-5.88.0/CMakeLists.txt --- old/kded-5.87.0/CMakeLists.txt 2021-10-02 16:25:14.000000000 +0200 +++ new/kded-5.88.0/CMakeLists.txt 2021-11-06 14:17:09.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.87.0") # handled by release scripts +set(KF_VERSION "5.88.0") # handled by release scripts set(KF_DEP_VERSION "5.87.0") # handled by release scripts project(KDED VERSION ${KF_VERSION}) @@ -42,7 +42,7 @@ # We don't install kded_version.h, it's only useful internally # (given that this framework produces no library) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055700) if (KF5DocTools_FOUND) kdoctools_install(po) add_subdirectory(docs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.87.0/src/kded.cpp new/kded-5.88.0/src/kded.cpp --- old/kded-5.87.0/src/kded.cpp 2021-10-02 16:25:14.000000000 +0200 +++ new/kded-5.88.0/src/kded.cpp 2021-11-06 14:17:09.000000000 +0100 @@ -126,13 +126,12 @@ static int phaseForModule(const KPluginMetaData &module) { - const QVariant phasev = module.rawData().value(QStringLiteral("X-KDE-Kded-phase")).toVariant(); - return phasev.isValid() ? phasev.toInt() : 2; + return module.value(QStringLiteral("X-KDE-Kded-phase"), 2); } QVector<KPluginMetaData> Kded::availableModules() const { - QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("kf5/kded")); + QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("kf5/kded")); QSet<QString> moduleIds; for (const KPluginMetaData &md : std::as_const(plugins)) { moduleIds.insert(md.pluginId()); @@ -292,7 +291,7 @@ return false; } KSharedConfig::Ptr config = KSharedConfig::openConfig(); - bool autoload = module.rawData().value(QStringLiteral("X-KDE-Kded-autoload")).toVariant().toBool(); + bool autoload = module.value(QStringLiteral("X-KDE-Kded-autoload"), false); KConfigGroup cg(config, QStringLiteral("Module-").append(module.pluginId())); autoload = cg.readEntry("autoload", autoload); return autoload; @@ -300,7 +299,7 @@ bool Kded::platformSupportsModule(const KPluginMetaData &module) const { - const QStringList supportedPlatforms = KPluginMetaData::readStringList(module.rawData(), QStringLiteral("X-KDE-OnlyShowOnQtPlatforms")); + const QStringList supportedPlatforms = module.value(QStringLiteral("X-KDE-OnlyShowOnQtPlatforms"), QStringList()); return supportedPlatforms.isEmpty() || supportedPlatforms.contains(qApp->platformName()); } @@ -316,13 +315,7 @@ return false; } KSharedConfig::Ptr config = KSharedConfig::openConfig(); - bool loadOnDemand = true; - // use toVariant() since it could be string or bool in the json and QJsonObject does not convert - QVariant p = module.rawData().value(QStringLiteral("X-KDE-Kded-load-on-demand")).toVariant(); - if (p.isValid() && (p.toBool() == false)) { - loadOnDemand = false; - } - return loadOnDemand; + return module.value(QStringLiteral("X-KDE-Kded-load-on-demand"), true); } KDEDModule *Kded::loadModule(const QString &obj, bool onDemand) @@ -353,9 +346,7 @@ } if (onDemand) { - // use toVariant() since it could be string or bool in the json and QJsonObject does not convert - QVariant p = module.rawData().value(QStringLiteral("X-KDE-Kded-load-on-demand")).toVariant(); - if (p.isValid() && (p.toBool() == false)) { + if (!module.value(QStringLiteral("X-KDE-Kded-load-on-demand"), true)) { noDemandLoad(moduleId); return nullptr; } @@ -363,20 +354,18 @@ KDEDModule *kdedModule = nullptr; - KPluginLoader loader(module.fileName()); - KPluginFactory *factory = loader.factory(); - if (factory) { - kdedModule = factory->create<KDEDModule>(this); + auto factoryResult = KPluginFactory::loadFactory(module); + if (factoryResult) { + kdedModule = factoryResult.plugin->create<KDEDModule>(this); } else { // TODO: remove this fallback code, the kded modules should all be fixed instead - KPluginLoader loader2(QStringLiteral("kded_") + module.fileName()); - factory = loader2.factory(); - if (factory) { + factoryResult = KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("kded_") + module.fileName())); + if (factoryResult) { qCWarning(KDED).nospace() << "found kded module " << moduleId << " by prepending 'kded_' to the library path, please fix your metadata."; - kdedModule = factory->create<KDEDModule>(this); + kdedModule = factoryResult.plugin->create<KDEDModule>(this); } else { - qCWarning(KDED).nospace() << "Could not load kded module " << moduleId << ":" << loader.errorString() << " (library path was:" << module.fileName() - << ")"; + qCWarning(KDED).nospace() << "Could not load kded module " << moduleId << ":" << factoryResult.errorText + << " (library path was:" << module.fileName() << ")"; } } @@ -744,9 +733,9 @@ QDBusConnectionInterface *bus = QDBusConnection::sessionBus().interface(); // Also register as all the names we should respond to (org.kde.kcookiejar, org.kde.khotkeys etc.) // so that the calling code is independent from the physical "location" of the service. - const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("kf5/kded")); + const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("kf5/kded")); for (const KPluginMetaData &metaData : plugins) { - const QString serviceName = metaData.rawData().value(QStringLiteral("X-KDE-DBus-ServiceName")).toString(); + const QString serviceName = metaData.value(QStringLiteral("X-KDE-DBus-ServiceName")); if (serviceName.isEmpty()) { continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.87.0/src/kded.h new/kded-5.88.0/src/kded.h --- old/kded-5.87.0/src/kded.h 2021-10-02 16:25:14.000000000 +0200 +++ new/kded-5.88.0/src/kded.h 2021-11-06 14:17:09.000000000 +0100 @@ -30,7 +30,7 @@ Q_OBJECT public: Kded(); - virtual ~Kded(); + ~Kded() override; static Kded *self() { @@ -227,7 +227,7 @@ Q_OBJECT public: KUpdateD(); - ~KUpdateD(); + ~KUpdateD() override; public Q_SLOTS: void runKonfUpdate();
