From f963e12185d9b45dcf0a6ecb6b9779f0bee7a24e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Tue, 29 Mar 2022 08:46:05 -0500
Subject: [PATCH] Do not set user-visible name as additional agent information
 (kde#451165)

---
 ...visible-name-as-additional-agent-inf.patch | 54 +++++++++++++++++++
 kf5-knewstuff.spec                            |  7 ++-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch

diff --git a/0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch b/0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch
new file mode 100644
index 0000000..4cd1a8b
--- /dev/null
+++ b/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 <alexander.lohnau@gmx.de>
+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<KNSCore::Provider> 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<Provider::CategoryMetadata> &categories) {
+                 d->categoriesMetadata = categories;
+                 Q_EMIT signalCategoriesMetadataLoded(categories);
+-- 
+2.35.1
+
diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec
index fc86578..8040a63 100644
--- a/kf5-knewstuff.spec
+++ b/kf5-knewstuff.spec
@@ -1,9 +1,8 @@
-%undefine __cmake_in_source_build
 %global framework knewstuff
 
 Name:    kf5-%{framework}
 Version: 5.92.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Frameworks 5 Tier 3 module for downloading application assets
 
 License: LGPLv2+
@@ -19,6 +18,7 @@ URL:     https://invent.kde.org/frameworks/%{framework}
 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
 ## upstream patches
+Patch10: 0010-Do-not-set-user-visible-name-as-additional-agent-inf.patch
 
 # filter qml provides
 %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$
@@ -106,6 +106,9 @@ developing applications that use %{name}.
 
 
 %changelog
+* Tue Mar 29 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.92.0-2
+- Do not set user-visible name as additional agent information (kde#451165)
+
 * Thu Mar 10 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.92.0-1
 - 5.92.0