[neon/kde/knewstuff/Neon/unstable] debian/patches: Revert "add patch recommended by maintainer https://bugs.kde.org/show_bug.cgi?id=451165"

[Jonathan Esk-Riddell]

Git commit 02769567a2448b58965ac9f5e00af4b8c00c1a02 by Jonathan Esk-Riddell.
Committed on 28/03/2022 at 09:29.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "add patch recommended by maintainer https://bugs.kde.org/show_bug.cgi?id=451165"

This reverts commit de1772e0106a33c43bf91bd1999d3afcc0c0f802.

D  +0    -48   debian/patches/non-english.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/knewstuff/commit/02769567a2448b58965ac9f5e00af4b8c00c1a02

diff --git a/debian/patches/non-english.diff b/debian/patches/non-english.diff
deleted file mode 100644
index 5a35500..0000000
--- a/debian/patches/non-english.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 693a2ea3926400b1482888a2df2c532852b8f971
-Author: Alexander Lohnau <alexander.lohnau at gmx.de>
-Date:   Sun Mar 20 20:29:51 2022 +0100
-
-    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
-
-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);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4b73bd7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-non-english.diff