diff --git a/0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch b/0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch deleted file mode 100644 index 11432ac..0000000 --- a/0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 675802e706a737c008aa74600ac804b06db52140 Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau -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 - diff --git a/frameworkintegration-5.90.0.tar.xz b/frameworkintegration-5.90.0.tar.xz deleted file mode 100644 index 63383c9..0000000 --- a/frameworkintegration-5.90.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5651afb5bb3563d2212662974bd91750b313e3b58fabf59f59459ef904a6fbec -size 1758208 diff --git a/frameworkintegration-5.90.0.tar.xz.sig b/frameworkintegration-5.90.0.tar.xz.sig deleted file mode 100644 index b501d8b..0000000 --- a/frameworkintegration-5.90.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmHQVy4ACgkQWNDuZIpI -s7tqgggAstYhcR00LW0m5RMrK1w/c1QBBjLUBBmMardY2XE/a3nzcDvbPM4JA25n -4uSfMa58TJ1A7+YcQ/vUKIFZRr8Y10Ze3km8AsVBate4ixHAF5lGiEe6XlvbzpJR -bq+yyQ3r9DTq4dz0ZfG3aAy5qdFXxcokhiHX9POW/pYgdnbG8U4iTd5h+HbPOku1 -HHMd+SZLUSHQfQygNlPJQyAiBXT2AultYdKxhPARVWnkaSgLjqCMjLRE41oZjnGy -oJHk/YVdza71lZ8vcEfDhyNPjWulKr6tBXf/0z2dDP33yWXDChSAGYxUto4q7MYg -t77VK8KOrf+pthsz9WsvUx9dgzocWA== -=m20R ------END PGP SIGNATURE----- diff --git a/frameworkintegration-5.91.0.tar.xz b/frameworkintegration-5.91.0.tar.xz new file mode 100644 index 0000000..8d4214b --- /dev/null +++ b/frameworkintegration-5.91.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fbc8c3b949849d22161f78df453d759389319a91b4925ff235799e410c5e684 +size 1758260 diff --git a/frameworkintegration-5.91.0.tar.xz.sig b/frameworkintegration-5.91.0.tar.xz.sig new file mode 100644 index 0000000..24f70ef --- /dev/null +++ b/frameworkintegration-5.91.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmH/keMACgkQWNDuZIpI +s7tvqwf/d1E0/gPhj4CPMnV6XPBulAzIzRVr8IvrzHzlJkaupu1xrNRLquE3hBGa +uTJ/HylLsP3QVOFSCL9SlHtBdCuyI1mqRcwwnawabBj8HtgV2IaaO/l4M7lMlKIC +B1CyCl0TLWwS6QNJr+b6Bw89hPSwubycU7m/WztEk9B5tZAkKNPL5tw8Q8C4LQhw +n5PVfP5l8cZL1X+5iiXZyoXYgIQQGE2Y22EZGw7bi+GGa5RErXH7wXREutvgtsob +C8II3dHGaRtphh4WzWbflIj+c3sG+Y3sUHBvNbytS1RE6z/1NFIOWwV9rH1QKuMV +igI9KBr+yMOEs++BRjGzg202H7M2xQ== +=ej1u +-----END PGP SIGNATURE----- diff --git a/frameworkintegration.changes b/frameworkintegration.changes index d766480..512a5c9 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Feb 6 10:16:46 UTC 2022 - Christophe Giboudeaux + +- Update to 5.91.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.91.0 +- Changes since 5.90.0: + * Add Linux Qt6 CI + * Install plugin in kf + * Fix wrong porting of KNSCore::Engine::configSearchLocations (kde#448237) + * Change build system for building against qt6 +- Drop 0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch + Merged upstream + ------------------------------------------------------------------- Wed Jan 12 14:17:20 UTC 2022 - Christophe Giboudeaux diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 173fb7f..a0e3384 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -17,7 +17,7 @@ %define lname libKF5Style5 -%define _tar_path 5.90 +%define _tar_path 5.91 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without released Name: frameworkintegration -Version: 5.90.0 +Version: 5.91.0 Release: 0 Summary: Plugins responsible for better integration of Qt applications in KDE Workspace License: LGPL-2.1-or-later @@ -36,8 +36,6 @@ 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 @@ -130,8 +128,7 @@ Applications do not need to link to this directly. Development files %files devel %{_kf5_libdir}/libKF5Style.so %{_kf5_libdir}/cmake/KF5FrameworkIntegration/ -%dir %{_kf5_includedir}/KStyle/ %{_kf5_includedir}/KStyle/ -%{_kf5_includedir}/*.h +%{_kf5_includedir}/FrameworkIntegration/ %changelog