diff --git a/521.patch b/521.patch deleted file mode 100644 index 06335f0..0000000 --- a/521.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 57187b7e6a1c6396c95b9450ff4c8acb8e70f431 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Tue, 5 Apr 2022 00:40:27 +0200 -Subject: [PATCH] AboutPage: Prevent infinite loop - -Do not use the width of the item but the width of the page to decide if -we are on wide mode in the FormLayout. - -For some reason our default height hits a perfect storm of: -- growing past the page height -- adds a scrollbar -- this narrows the view and we enable the compact mode -- this makes it fit again -- goto 0 - -BUG: 447958 ---- - src/controls/AboutItem.qml | 2 ++ - src/controls/AboutPage.qml | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/src/controls/AboutItem.qml b/src/controls/AboutItem.qml -index fbc720a1..675bab44 100644 ---- a/src/controls/AboutItem.qml -+++ b/src/controls/AboutItem.qml -@@ -74,6 +74,8 @@ Item - /** @internal */ - property bool _usePageStack: false - -+ property alias wideMode: form.wideMode -+ - /** @internal */ - default property alias _content: form.data - -diff --git a/src/controls/AboutPage.qml b/src/controls/AboutPage.qml -index e0043343..22994940 100644 ---- a/src/controls/AboutPage.qml -+++ b/src/controls/AboutPage.qml -@@ -95,6 +95,7 @@ ScrollablePage - - AboutItem { - id: aboutItem -+ wideMode: page.width >= aboutItem.implicitWidth - - _usePageStack: applicationWindow().pageStack ? true : false - } --- -GitLab - diff --git a/kf5-kirigami2.spec b/kf5-kirigami2.spec index 822cfb5..6b95ba1 100644 --- a/kf5-kirigami2.spec +++ b/kf5-kirigami2.spec @@ -8,8 +8,8 @@ %endif Name: kf5-%{framework} -Version: 5.93.0 -Release: 2%{?dist} +Version: 5.88.0 +Release: 1%{?dist} Summary: QtQuick plugins to build user interfaces based on the KDE UX guidelines # All LGPLv2+ except for src/desktopicons.h (GPLv2+) @@ -26,9 +26,6 @@ URL: https://techbase.kde.org/Kirigami Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream paches -# Backport of "AboutPage: Prevent infinite loop" (Fixes RHBZ#2057563) -# https://invent.kde.org/frameworks/kirigami/-/merge_requests/521 -Patch01: 521.patch # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ @@ -126,30 +123,6 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||: %changelog -* Mon Apr 11 2022 Frantisek Zatloukal - 5.93-2 -- Backport of "AboutPage: Prevent infinite loop" (Fixes RHBZ#2057563) - -* Sun Apr 10 2022 Justin Zobel - 5.93-1 -- Update to 5.93 - -* Thu Mar 10 2022 Rex Dieter - 5.92.0-1 -- 5.92.0 - -* Tue Mar 08 2022 Jan Grulich - 5.91.0-2 -- Rebuild (qt5) - -* Fri Feb 11 2022 Rex Dieter - 5.91.0-1 -- 5.91.0 - -* Thu Jan 20 2022 Fedora Release Engineering - 5.90.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 04 2022 Marc Deop i Argemí (Private) - 5.90.0-1 -- 5.90.0 - -* Wed Dec 08 2021 Rex Dieter - 5.89.0-1 -- 5.89.0 - * Mon Nov 08 2021 Marc Deop - 5.88.0-1 - 5.88.0 diff --git a/sources b/sources index 35cfade..d2bd212 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (kirigami2-5.92.0.tar.xz) = 42d75b8931f28ce2fa200c19acfc9194518b856dd33d9bbeb490f24ddb0ae03ba7c01443a5bc2a07088de69a9300245434460ddcd28cb2b1caa2f2288e45405a -SHA512 (kirigami2-5.93.0.tar.xz) = 372d464a79dafa061e4c07528c4765445b89988bbbf345019a8f544c4012a0c64abf8a07d4b97b4d1874af6753cb357b4f11d958face1ce17b3de8e6daddded2 +SHA512 (kirigami2-5.88.0.tar.xz) = adb20c007bd8d1206be87d936a9affe1f7e2203158ec5ee241bde8e60e2b6e1d701393c4d85841644321f70496de1e67cb4feb9009c2cd7d153eba2407c480fb diff --git a/sources.basename b/sources.basename deleted file mode 100644 index 8da1c4c..0000000 --- a/sources.basename +++ /dev/null @@ -1 +0,0 @@ -kirigami2