pool/frameworkintegration
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add regression fix

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=268
This commit is contained in:
Christophe Giboudeaux 2022-01-12 09:43:19 +00:00 committed by Git OBS Bridge
parent ad927d9bd4
commit d34e1ce051
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch Normal file
View File

@ -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);
--
2.34.1

2
frameworkintegration.changes
View File

@ -8,6 +8,8 @@ Mon Jan 3 12:47:11 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Changes since 5.89.0:
* Fix clazy warning
* Make it compiles against kf5.89
- Add upstream change to fix a regression in 5.90.0
* 0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch
-------------------------------------------------------------------
Sat Dec 4 22:56:16 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

2
frameworkintegration.spec
View File

@ -36,6 +36,8 @@ Source: %{name}-%{version}.tar.xz
Source1: %{name}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem