diff --git a/.gitignore b/.gitignore index b9f3c13..cdb5bd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/knewstuff-5.105.0.tar.xz +SOURCES/knewstuff-5.108.0.tar.xz diff --git a/.kf5-knewstuff.metadata b/.kf5-knewstuff.metadata index dc0a144..a8e4e87 100644 --- a/.kf5-knewstuff.metadata +++ b/.kf5-knewstuff.metadata @@ -1 +1 @@ -f31ac922bf3e1d2bf09658c93dc0647259c04fb1 SOURCES/knewstuff-5.105.0.tar.xz +6cd053d72ca6abd75ca02aba281fc35f296f0136 SOURCES/knewstuff-5.108.0.tar.xz diff --git a/SOURCES/0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch b/SOURCES/0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch new file mode 100644 index 0000000..4cd1a8b --- /dev/null +++ b/SOURCES/0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch @@ -0,0 +1,54 @@ +From 693a2ea3926400b1482888a2df2c532852b8f971 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Sun, 20 Mar 2022 20:29:51 +0100 +Subject: [PATCH 10/15] Do not set user-visible name as additional agent + information + +Instead we want the filename, which is more useful as an identifier anyways, because +we would otherwise have to check which user-visible names originate from which knsrc file. + +BUG: 451165 +--- + src/core/engine.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/core/engine.cpp b/src/core/engine.cpp +index e7abfde8..72af9c83 100644 +--- a/src/core/engine.cpp ++++ b/src/core/engine.cpp +@@ -145,6 +145,7 @@ public: + QString busyMessage; + QString useLabel; + bool uploadEnabled = false; ++ QString configFileName; + }; + + Engine::Engine(QObject *parent) +@@ -224,6 +225,7 @@ bool Engine::init(const QString &configfile) + conf.reset(new KConfig(configfile)); + qCWarning(KNEWSTUFFCORE) << "Using a deprecated location for the knsrc file" << configfile + << " - please contact the author of the software which provides this file to get it updated to use the new location"; ++ configFileName = QFileInfo(configfile).baseName(); + } else if (isRelativeConfig && actualConfig.isEmpty()) { + configFileName = QFileInfo(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("knsrcfiles/%1").arg(configfile))).baseName(); + conf.reset(new KConfig(QStringLiteral("knsrcfiles/%1").arg(configfile), KConfig::FullConfig, QStandardPaths::GenericDataLocation)); +@@ -234,6 +236,7 @@ bool Engine::init(const QString &configfile) + configFileName = configFileInfo.baseName(); + conf.reset(new KConfig(configfile)); + } ++ d->configFileName = configFileName; + + if (conf->accessMode() == KConfig::NoAccess) { + Q_EMIT signalErrorCode(KNSCore::ConfigFileError, i18n("Configuration file exists, but cannot be opened: \"%1\"", configfile), configfile); +@@ -425,7 +428,7 @@ void Engine::slotProviderFileLoaded(const QDomDocument &doc) + + QSharedPointer provider; + if (isAtticaProviderFile || n.attribute(QStringLiteral("type")).toLower() == QLatin1String("rest")) { +- provider.reset(new AtticaProvider(m_categories, d->name)); ++ provider.reset(new AtticaProvider(m_categories, d->configFileName)); + connect(provider.data(), &Provider::categoriesMetadataLoded, this, [this](const QList &categories) { + d->categoriesMetadata = categories; + Q_EMIT signalCategoriesMetadataLoded(categories); +-- +2.35.1 + diff --git a/SPECS/kf5-knewstuff.spec b/SPECS/kf5-knewstuff.spec index bc85431..9e31ea0 100644 --- a/SPECS/kf5-knewstuff.spec +++ b/SPECS/kf5-knewstuff.spec @@ -1,7 +1,7 @@ %global framework knewstuff Name: kf5-%{framework} -Version: 5.105.0 +Version: 5.108.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 module for downloading application assets @@ -102,9 +102,18 @@ developing applications that use %{name}. %changelog -* Wed Jul 26 2023 Arkady L. Shane - 5.105.0-1 +* Wed Jul 26 2023 Arkady L. Shane - 5.108.0-1 - Rebuilt for MSVSphere 9.2 +* Sun Jul 02 2023 Marc Deop i Argemí - 5.108.0-1 +- 5.108.0 + +* Sat Jun 03 2023 Marc Deop i Argemí - 5.107.0-1 +- 5.107.0 + +* Mon May 15 2023 Marc Deop i Argemí - 5.106.0-1 +- 5.106.0 + * Sun Apr 02 2023 Marc Deop i Argemí - 5.105.0-1 - 5.105.0