rpms
/
qt5-qtdeclarative
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'f27' into f26

This commit is contained in:
Rex Dieter 2018-02-02 18:29:22 -06:00
parent 6ef1ef1e2c caecc79beb
commit 17392a98f0
4 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,4 @@
/qtdeclarative-opensource-src-5.9.1.tar.xz
/qtdeclarative-opensource-src-5.9.2.tar.xz
/qtdeclarative-opensource-src-5.9.3.tar.xz
/qtdeclarative-opensource-src-5.9.4.tar.xz

31
0051-Make-sure-we-remove-stopped-animators-from-the-list-.patch
View File

@ -1,31 +0,0 @@
From 6990ae6c1bad32952e371fa72bee65a7af11c313 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar@crimson.no>
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 <jpnurmi@qt.io>
---
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<QAbstractAnimationJob> &toStop : qAsConst(m_rootsPendingStop))
+ for (const QSharedPointer<QAbstractAnimationJob> &toStop : qAsConst(m_rootsPendingStop)) {
toStop->stop();
+ m_animationRoots.remove(toStop.data());
+ }
m_rootsPendingStop.clear();
--
2.14.3

19
qt5-qtdeclarative.spec
View File

@ -13,8 +13,8 @@
Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module}
Version: 5.9.2
Release: 3%{?dist}
Version: 5.9.4
Release: 1%{?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
@ -55,6 +53,7 @@ Patch202: http://sources.debian.net/data/main/q/qtdeclarative-opensource-src/5.9
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
Obsoletes: qt5-qtjsbackend < 5.2.0
Obsoletes: qt5-qtdeclarative-render2d < 5.7.1-10
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtbase-private-devel
@ -76,6 +75,7 @@ BuildRequires: xorg-x11-server-Xvfb
%package devel
Summary: Development files for %{name}
Obsoletes: qt5-qtjsbackend-devel < 5.2.0
Obsoletes: qt5-qtdeclarative-render2d-devel < 5.7.1-10
Provides: %{name}-private-devel = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
@ -102,7 +102,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
@ -234,8 +233,14 @@ make check -k -C tests ||:
%changelog
* Fri Jan 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-3
- branch backport: Stopped animators are not removed (#1536606,kde#388759)
* Wed Jan 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-1
- 5.9.4
* Thu Nov 23 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.3-1
- 5.9.3
* Tue Oct 31 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-3
- Obsoletes: qt5-qtdeclarative-render2d
* Thu Oct 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2
- revert commit causing regresions (QTBUG-64017)

2
sources
View File

@ -1 +1 @@
SHA512 (qtdeclarative-opensource-src-5.9.2.tar.xz) = 49b8b50932b73ea39da14ac3425044193dfd64eabceadba379aa01cf2fc141177f9870c387caf1cf93ce09e8b197828a54b8d9fcefc4d9cdf400a6c6dd9a9e90
SHA512 (qtdeclarative-opensource-src-5.9.4.tar.xz) = e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c