Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2022-01-14 23:12:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Fri Jan 14 23:12:47 2022 rev:104 rq:945855 version:5.90.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2022-01-11 21:18:15.768916338 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new.1892/frameworkintegration.changes
2022-01-14 23:13:25.274638776 +0100
@@ -1,0 +2,6 @@
+Wed Jan 12 14:17:20 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Add upstream change to fix a regression in 5.90.0 (kde#448237)
+ * 0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.KtmCBU/_old 2022-01-14 23:13:25.766639093 +0100
+++ /var/tmp/diff_new_pack.KtmCBU/_new 2022-01-14 23:13:25.774639098 +0100
@@ -36,6 +36,8 @@
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
++++++ 0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch ++++++
>From 675802e706a737c008aa74600ac804b06db52140 Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <[email protected]>
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
