diff --git a/0051-Make-sure-we-remove-stopped-animators-from-the-list-.patch b/0051-Make-sure-we-remove-stopped-animators-from-the-list-.patch deleted file mode 100644 index eb5b07d..0000000 --- a/0051-Make-sure-we-remove-stopped-animators-from-the-list-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6990ae6c1bad32952e371fa72bee65a7af11c313 Mon Sep 17 00:00:00 2001 -From: Gunnar Sletta -Date: Mon, 23 Oct 2017 15:03:05 +0200 -Subject: [PATCH 051/140] Make sure we remove stopped animators from the list - of roots - -Change-Id: I89b36ee7d03ac6b8d07b24c656d3311728e8f9c3 -Reviewed-by: J-P Nurmi ---- - src/quick/util/qquickanimatorcontroller.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp -index 3f7347c01..5cf805192 100644 ---- a/src/quick/util/qquickanimatorcontroller.cpp -+++ b/src/quick/util/qquickanimatorcontroller.cpp -@@ -123,8 +123,10 @@ static void qquickanimator_sync_before_start(QAbstractAnimationJob *job) - - void QQuickAnimatorController::beforeNodeSync() - { -- for (const QSharedPointer &toStop : qAsConst(m_rootsPendingStop)) -+ for (const QSharedPointer &toStop : qAsConst(m_rootsPendingStop)) { - toStop->stop(); -+ m_animationRoots.remove(toStop.data()); -+ } - m_rootsPendingStop.clear(); - - --- -2.14.3 - diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 07315ea..f5f2165 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -14,7 +14,7 @@ Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} Version: 5.9.2 -Release: 3%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -35,8 +35,6 @@ Patch1: qtdeclarative-opensource-src-5.9.0-no_sse2.patch Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch ## upstream patches -Patch51: 0051-Make-sure-we-remove-stopped-animators-from-the-list-.patch - # regression https://bugreports.qt.io/browse/QTBUG-64017 # so revert this offending commit (for now) Patch111: 0111-Fix-qml-cache-invalidation-when-changing-dependent-C.patch @@ -101,7 +99,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %endif %patch2 -p1 -b .QQuickShaderEffectSource_deadlock -%patch51 -p1 -b .0051 %patch111 -p1 -R -b .0111 %patch201 -p0 -b .kdebug346118 @@ -233,9 +230,6 @@ make check -k -C tests ||: %changelog -* Fri Jan 19 2018 Rex Dieter - 5.9.2-3 -- branch backport: Stopped animators are not removed (#1536606,kde#388759) - * Thu Oct 26 2017 Rex Dieter - 5.9.2-2 - revert commit causing regresions (QTBUG-64017)