gentoo resync : 16.01.2021

3 files changed, 52 insertions, 3 deletions

diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index e05a9fd0a441..45126c0c842c 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,6 @@
+AUX frameworkintegration-5.90.0-fix-install-KNS-items-w-deps.patch 1824 BLAKE2B 2e073af31b99cd6b5f9273953d6bf31e797ade0f4ea5e2c189ba0b40a1f4d32390ccfb0ea3988d22f7d888a7ec0f00c504f447043f0aeb90eae9e1bc5e56afa1 SHA512 2e5abc183359fa8246dbc146b3726726db59a8c5665ba59d0e647fda8bbdd53f7f5ba483f0ebcaef42eb7e506ee5f886ee58169a5d946da3f0c6614522ce632b
 DIST frameworkintegration-5.88.0.tar.xz 1756084 BLAKE2B 38b827ab48b5c3e5ca98f9fafc022e6ad33eb056a2ffe2f6e82490c0c155984f54cde4fdb2a91af5709341b78977e14222c94af86d9127ac1710a51f46502607 SHA512 50944c4eaf40213cbb25f19bd35fa1e410778791c8a993b75ffed922f8e07d984735a0a6362bb2598dca085be7739e4981d0469bd07783b2276d3bb564274e0d
-DIST frameworkintegration-5.89.0.tar.xz 1758252 BLAKE2B 8cae071f43d140cb08c22e23eab8fdad44bed7aa115ed0316062fb006417c3f2393db032e9e6f4b6c71a935d51786a19ec7116c5a01bf5f62ee8d4894688b184 SHA512 9e0842c559bbd633a860fd2f4f93540efa1fc4b0ecc8c37ce99f4f3e4ac00e40163cd827af9d9acb3d74808214c81ccc9e9e91fec1b3aa2ac9d50d054f16e508
+DIST frameworkintegration-5.90.0.tar.xz 1758208 BLAKE2B c8a7a11677ca77032be1ef1491ba5d8efa356caf6e7704b240a50baec7119b64ba85d4d183692164a1de58ee42c8d92686c9abe3d14af0bd8493ff747d9ddb7f SHA512 4f27d8aa453ab5d08e410db4c93bd86386159bb3e82a65cff0c4264ec3467f916a761e7cc0f68365c3f821cce8c84ff6277afb975a967fe26ed7a545155defca
 EBUILD frameworkintegration-5.88.0.ebuild 996 BLAKE2B b86a1104b8818d91e389de6ee1c842e0162ad64ec4af36cd18556af2cf15e63fd0740a5376af3cad89e634b9d4c372593f7d9222cc7c137b6245743e9f74bd30 SHA512 b5dad393d1f8c77d8cca3870ab3ef5bb206adaa3f0c5c96f850e9291aebb299fe8bba8e5630ebefa5fdc7429109924de7a046e723698baff340f294fdbc2d093
-EBUILD frameworkintegration-5.89.0.ebuild 999 BLAKE2B 1fb9970af1d6d216ffb54713db1705bc7207cee6636b0130f2f162bcdc9ebf302ada3adfa74e74bea71d5f8b7c293e41f8917801f77b499424ed2e6eb89c3cb3 SHA512 bfd51abff3bf71b2b84f164f757fbbb96774a6aa65ffe3c4a8914d23509423105e63e141555f508a76b8ba6c90fcaa235643b4229b9d77fbe7c1ac450aa6558f
+EBUILD frameworkintegration-5.90.0-r1.ebuild 1083 BLAKE2B b120a4e66e12429c509bd53bb51b531f1f5efde97ed3fd77f0c49e3f685ccc6d3d770b6a27aa107549a0c1ef64780ff47aa59cc69bae92d4679cd5028b84c452 SHA512 13d82e4eb0cce7776f7ffeaedfe73e7403f48794275e6c5a6ab36e0b3fbfc175b45e4162e546b2b18814aa35eda5d1a041a8805cba78d0a83a5c3559c79d7b89
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/frameworkintegration/files/frameworkintegration-5.90.0-fix-install-KNS-items-w-deps.patch b/kde-frameworks/frameworkintegration/files/frameworkintegration-5.90.0-fix-install-KNS-items-w-deps.patch
new file mode 100644
index 000000000000..fabbee1e1d65
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/files/frameworkintegration-5.90.0-fix-install-KNS-items-w-deps.patch
@@ -0,0 +1,46 @@
+From 675802e706a737c008aa74600ac804b06db52140 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Tue, 11 Jan 2022 06:42:03 +0100
+Subject: [PATCH] Fix wrong porting of KNSCore::Engine::configSearchLocations
+
+The `KNSCore::Engine::availableConfigFiles` method returns the file names, but
+the code still assumed that the directories where the file is contained is returned.
+Consequently the knsrc files would never be found.
+
+BUG: 448237
+---
+ src/kpackage-install-handlers/kns/main.cpp | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/src/kpackage-install-handlers/kns/main.cpp b/src/kpackage-install-handlers/kns/main.cpp
+index 9978844..a2b530e 100644
+--- a/src/kpackage-install-handlers/kns/main.cpp
++++ b/src/kpackage-install-handlers/kns/main.cpp
+@@ -70,17 +70,16 @@ int main(int argc, char **argv)
+     Q_ASSERT(url.scheme() == QLatin1String("kns"));
+ 
+     QString knsname;
+-    for (const auto &location : KNSCore::Engine::availableConfigFiles()) {
+-        QString candidate = location + QLatin1Char('/') + url.host();
+-        if (QFile::exists(candidate)) {
+-            knsname = candidate;
+-            break;
+-        }
+-    }
++    const QStringList availableConfigFiles = KNSCore::Engine::availableConfigFiles();
++    auto knsNameIt = std::find_if(availableConfigFiles.begin(), availableConfigFiles.end(), [&url](const QString &availableFile) {
++        return availableFile.endsWith(QLatin1String("/") + url.host());
++    });
+ 
+-    if (knsname.isEmpty()) {
++    if (knsNameIt == availableConfigFiles.end()) {
+         qWarning() << "couldn't find knsrc file for" << url.host();
+         return 1;
++    } else {
++        knsname = *knsNameIt;
+     }
+ 
+     const auto pathParts = url.path().split(QLatin1Char('/'), Qt::SkipEmptyParts);
+-- 
+GitLab
+
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.89.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.90.0-r1.ebuild
index d52fad501353..1a00bc011db1 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.89.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.90.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
 "
 
+PATCHES=( "${FILESDIR}"/${P}-fix-install-KNS-items-w-deps.patch ) # KDE-bug 448237
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON