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

Jonathan Esk-Riddell null at kde.org
Mon Mar 28 10:29:28 BST 2022


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

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

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

https://invent.kde.org/neon/kde/knewstuff/commit/de1772e0106a33c43bf91bd1999d3afcc0c0f802

diff --git a/debian/patches/non-english.diff b/debian/patches/non-english.diff
new file mode 100644
index 0000000..5a35500
--- /dev/null
+++ b/debian/patches/non-english.diff
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 0000000..4b73bd7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+non-english.diff


More information about the Neon-commits mailing list