gentoo resync : 06.04.2022

3 files changed, 57 insertions, 1 deletions

diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index be051d115831..4d0390f5bde9 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,7 +1,8 @@
 AUX knewstuff-5.90.0-add-conditional-cache-preference.patch 2827 BLAKE2B cfa37e232f0c534ab6431ec52dd108f66a1d9f1a3a4551e2ea00247112990a13baaa5ba05585a7ab582d3ed98cff87d7fbfe365946f2357ec23ec4bfcff334d0 SHA512 5b20a0218380737fcfd6435ef7aad7e28ee635efe3dcbbd17e8fc9b2f1965b779345ac7420bc6f18140c4b647c25ace119aa7d6ad27ecc038bc488c6bcf2ee80
 AUX knewstuff-5.90.0-ensure-correct-ProvidersUrl.patch 1264 BLAKE2B 7b22f0e173d7460caeb82ec4be514292093e2423bbfae7465f4bf038259ee734ff3960b6a0d41fdc9c03b08dfd738846bf3839a0fdb21a5054531968c3e328d6 SHA512 e45c22952c87234b25915b7039e2e4cca1c920d6fea32ed29a93c6f45940b6a1b09f8d38bba929f55bbdd63d868327436f83b107808e62c6a45f405f90a09324
+AUX knewstuff-5.92.0-KDEBUG-451165.patch 2700 BLAKE2B 0478eb83efc569151a0ecc043ce28f26e14a3803019e71039634fbac095204882c45a43d4f0520d8199c037a4cb291e543ec61c5667e84f52044a50877996f3d SHA512 170f6155f78b1386b4a807bcec1765c9bc8c7aec589a7ed364159597e324eacca390cef63152ddcb9f6d81b175089ece8628c6f861a4e3089cad2978188729b6
 DIST knewstuff-5.90.0.tar.xz 1151308 BLAKE2B 3ee001569596c96b7a28696b1be22f5138f7f274ed87b7255d3809a32304b3eacf594ab78627266d8227bb7330fd1e90526b2d93bf4f82c780050bd5d1f7c548 SHA512 d80b743691eb9665e0df196a69db3cee2247bbfe6c34ea5e9511c94558d2e807c9aca867aef6cd4344eaae6f252d9fff6b3e7a31c152b8a8b69b8d54813ede28
 DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8
 EBUILD knewstuff-5.90.0-r1.ebuild 1468 BLAKE2B 93a3c9fd4d72de1e1acf0ceac1d885a2827afefa1a9c95a41843e67b5b28a69efd298ce9d4a205fa89ff45d555fd8a3654fa0936d08517fbf6e088c22227040e SHA512 16604d4eb4ac5694a2883a3965b455d4504d4c14dd05795feb668314d657e6315141da109a1143797b3cd18cb889657caf21beef5fee1cf09e73e2330b118d18
-EBUILD knewstuff-5.92.0.ebuild 1272 BLAKE2B f258e3a95875eb05cea822c7718758107b2a0fd322c28b77863f4274e2e8d2c0cc72216c2fd3a0336687bd05c37a2984249e1ee33da59eeb6c4e625cad1274c5 SHA512 e4f8515a2bae8807080c6f3bf0db0eebf16d2b1f23c75efac5a5ceb6bd291b2ab742ad2b6bdf526498f003e7930b20390dc5d92ea21c3be0ed188736e54be9c2
+EBUILD knewstuff-5.92.0-r1.ebuild 1324 BLAKE2B 731bada9d972ef39cb1cd95d67de5e453065215729150f7e83d58896e976aee89ed72aafd676960ad4bba1e1050e7aff509f314d8ae65d5fb3ff39fcdf47085f SHA512 3ba5ef975e6fbdf0e485b188780ea472f5a53efa946d4b8e760f481740c805cdc668e3f0756b57b43bcb73b950b754541a9130f6ee65a5490466ba331f31692b
 MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch
new file mode 100644
index 000000000000..07f4170ae0ce
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch
@@ -0,0 +1,53 @@
+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] 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);
+-- 
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.92.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.92.0-r1.ebuild
index 974b65f15605..362d3beb80ef 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.92.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.92.0-r1.ebuild
@@ -40,6 +40,8 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-KDEBUG-451165.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package opds KF5Syndication)