From c3e352e91c6cb862efd944b3e595d0bb4370aff824709bb678b96991f859787c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 7 Aug 2019 12:44:23 +0000 Subject: [PATCH] Cleanup: - Don't lower minimum Qt version anymore - Drop patches for Qt 5.9 - Drop patches for Leap 42.x - Drop conditionals for no longer supported distribution versions OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kwidgetsaddons?expand=0&rev=190 --- ...-use-AnimationDuration-if-Qt-lt-5.10.patch | 44 ------------------- kwidgetsaddons.changes | 7 +++ kwidgetsaddons.spec | 6 --- 3 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 0001-Do-not-use-AnimationDuration-if-Qt-lt-5.10.patch diff --git a/0001-Do-not-use-AnimationDuration-if-Qt-lt-5.10.patch b/0001-Do-not-use-AnimationDuration-if-Qt-lt-5.10.patch deleted file mode 100644 index 1300c80..0000000 --- a/0001-Do-not-use-AnimationDuration-if-Qt-lt-5.10.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 953939b4727cf46b1e100e29f020e735c2cf92f5 Mon Sep 17 00:00:00 2001 -From: Christoph Feck -Date: Wed, 26 Sep 2018 22:25:23 +0200 -Subject: [KCollapsibleGroupBox] Respect style's widget animation duration - -Query QStyle::SH_Widget_Animation_Duration style hint. - -QTimeLine requires a duration > 0, so use 1 [ms] to make -the animation as fast as possible when disabled. - -BUG: 397103 -FIXED-IN: 5.51.0 - -Reviewed by: ngraham, elvisangelaccio - -Differential Revision: https://phabricator.kde.org/D15611 ---- - src/kcollapsiblegroupbox.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -Rebased by Antonio Larrosa to recover this patch -which was later removed by upstream - -diff --git a/src/kcollapsiblegroupbox.cpp b/src/kcollapsiblegroupbox.cpp -index e44ef2a..ad9a918 100644 ---- a/src/kcollapsiblegroupbox.cpp -+++ b/src/kcollapsiblegroupbox.cpp -@@ -122,9 +122,13 @@ void KCollapsibleGroupBox::setExpanded(bool expanded) - d->updateChildrenFocus(expanded); - - d->animation->setDirection(expanded ? QTimeLine::Forward : QTimeLine::Backward); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - // QTimeLine::duration() must be > 0 - const int duration = qMax(1, style()->styleHint(QStyle::SH_Widget_Animation_Duration)); - d->animation->setDuration(duration); -+#else -+ d->animation->setDuration(style()->styleHint(QStyle::SH_Widget_Animate, nullptr, this) ? 500 : 1); -+#endif - d->animation->start(); - - //when going from collapsed to expanded changing the child visibility calls an updateGeometry --- -cgit v1.1 - diff --git a/kwidgetsaddons.changes b/kwidgetsaddons.changes index a092a06..db3cbcd 100644 --- a/kwidgetsaddons.changes +++ b/kwidgetsaddons.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 19 11:45:35 UTC 2019 - Wolfgang Bauer + +- Don't lower minimum Qt version anymore, it requires 5.11 now +- Drop patch to support Qt 5.9: + * 0001-Do-not-use-AnimationDuration-if-Qt-lt-5.10.patch + ------------------------------------------------------------------- Sun Jul 14 06:41:39 UTC 2019 - lbeltrame@kde.org diff --git a/kwidgetsaddons.spec b/kwidgetsaddons.spec index ead3383..7d22ac3 100644 --- a/kwidgetsaddons.spec +++ b/kwidgetsaddons.spec @@ -32,8 +32,6 @@ Group: System/GUI/KDE URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-OPENSUSE -Patch0: 0001-Do-not-use-AnimationDuration-if-Qt-lt-5.10.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -81,10 +79,6 @@ Development files. %prep %setup -q -%autopatch -p1 -%if 0%{?suse_version} == 1500 -sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt -%endif %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert