Update to 5.6.1

.gitignore

@@ -3,3 +3,4 @@
 /qtdeclarative-opensource-src-5.6.0-beta.tar.gz
 /qtdeclarative-opensource-src-5.6.0-rc.tar.xz
 /qtdeclarative-opensource-src-5.6.0.tar.xz
+/qtdeclarative-opensource-src-5.6.1.tar.xz

0008-Fix-crash-when-Canvas-has-negative-width-or-height.patch

@@ -1,33 +0,0 @@
-From 9783991b615484d2926e9648b10ea090af81d93f Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis@theqtcompany.com>
-Date: Wed, 3 Feb 2016 12:57:05 +0100
-Subject: [PATCH 08/61] Fix crash when Canvas has negative width or height
-
-m_fbo is null when using a threaded render loop.
-
-Change-Id: I297ba651f9605f1718dbe9d09bd30e9682fb8401
-Task-number: QTBUG-50085
-Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
----
- src/quick/items/context2d/qquickcontext2dtexture.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp
-index 73b0b55..5ac971d 100644
---- a/src/quick/items/context2d/qquickcontext2dtexture.cpp
-+++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp
-@@ -599,6 +599,11 @@ QPaintDevice* QQuickContext2DFBOTexture::beginPainting()
- void QQuickContext2DFBOTexture::endPainting()
- {
-     QQuickContext2DTexture::endPainting();
-+
-+    // There may not be an FBO due to zero width or height.
-+    if (!m_fbo)
-+        return;
-+
-     if (m_multisampledFbo)
-         QOpenGLFramebufferObject::blitFramebuffer(m_fbo, m_multisampledFbo);
- 
--- 
-1.9.3
-

0019-Revert-Fix-crash-on-QQmlEngine-destruction.patch

@@ -1,60 +0,0 @@
-From 427ca15418c05e628bae3451c263be198e721ba9 Mon Sep 17 00:00:00 2001
-From: Robin Burchell <robin.burchell@viroteck.net>
-Date: Wed, 17 Feb 2016 01:35:29 +0100
-Subject: [PATCH 19/61] Revert "Fix crash on QQmlEngine destruction."
-
-This reverts commit 2e75be5f64fb21cbbdff3353dbd507c2ca26946a.
-
-This patch was originally written by Andrew den Exter in
-222e06bf4ed509e72c1533cbe1d4859ca96933f3, externally from the main Qt tree. I
-upstreamed this as part of our porting efforts.
-
-Some time later, this was accidentally reverted in
-2e75be5f64fb21cbbdff3353dbd507c2ca26946a: we can't go back in time to examine
-exactly what happened, but presumably Andrew didn't notice that I had upstreamed
-this, attempted to apply the patch and ignored the "already applied" warning by
-accident - and continued on dutifully with the patch accidentally reverted.
-
-This change is correct, though, and is thus reinstated.
-
-Change-Id: Idfe6ab39ad011f0401de25fe056aa3eb3fb8b424
-Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
-Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
----
- src/qml/qml/qqmlengine.cpp | 4 ++--
- src/qml/qml/qqmlengine_p.h | 3 +--
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
-index 109cfac..2cfe468 100644
---- a/src/qml/qml/qqmlengine.cpp
-+++ b/src/qml/qml/qqmlengine.cpp
-@@ -598,8 +598,8 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e)
-   workerScriptEngine(0),
-   activeObjectCreator(0),
-   networkAccessManager(0), networkAccessManagerFactory(0), urlInterceptor(0),
--  scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1),
--  incubatorCount(0), incubationController(0)
-+  scarceResourcesRefCount(0), importDatabase(e), typeLoader(e),
-+  uniqueId(1), incubatorCount(0), incubationController(0)
- {
- }
- 
-diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
-index 26ee3bd..072a6c4 100644
---- a/src/qml/qml/qqmlengine_p.h
-+++ b/src/qml/qml/qqmlengine_p.h
-@@ -166,9 +166,8 @@ public:
-     void referenceScarceResources();
-     void dereferenceScarceResources();
- 
--    QQmlTypeLoader typeLoader;
-     QQmlImportDatabase importDatabase;
--
-+    QQmlTypeLoader typeLoader;
- 
-     QString offlineStoragePath;
- 
--- 
-1.9.3
-

0029-Avoid-div-by-zero-when-nothing-is-rendered.patch

@@ -1,30 +0,0 @@
-From e01bed44bca9bd0919f70dfc14f8297415d61bd9 Mon Sep 17 00:00:00 2001
-From: Gunnar Sletta <gunnar@sletta.org>
-Date: Mon, 15 Feb 2016 08:02:50 +0100
-Subject: [PATCH 29/61] Avoid div-by-zero when nothing is rendered.
-
-Change-Id: I3eb57baf1812f831335429cc7d2b4424f3cfa785
-Task-number: QTBUG-50929
-Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
----
- src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
-index b1792d2..dd1ff14 100644
---- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
-+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
-@@ -2654,7 +2654,9 @@ void Renderer::render()
-         if (m_alphaBatches.size())
-             std::sort(&m_alphaBatches.first(), &m_alphaBatches.last() + 1, qsg_sort_batch_increasing_order);
- 
--        m_zRange = 1.0 / (m_nextRenderOrder);
-+        m_zRange = m_nextRenderOrder != 0
-+                 ? 1.0 / (m_nextRenderOrder)
-+                 : 0;
-     }
- 
-     if (Q_UNLIKELY(debug_render())) timeSorting = timer.restart();
--- 
-1.9.3
-

0135-Workaround-for-crashes-in-QtQml-code-relating-to-nul.patch

@@ -1,38 +0,0 @@
-From 18e77550f149722e0554f24ddfa326e03a9fef10 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Thu, 19 May 2016 15:56:10 -0700
-Subject: [PATCH 135/149] Workaround for crashes in QtQml code relating to null
- this pointers
-
-When compiled in release mode with GCC 6, QtQml crashes. This option
-gets works around the issue by instructing the compiler not to delete
-null pointer checks for pointers that the standard says cannot be null,
-yet apparently are.
-
-This is a temporary workaround until a proper solution is found.
-
-Change-Id: Id3aab65533904562a6cbfffd14501a185fc91179
-Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
----
- src/qml/qml.pro | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/qml/qml.pro b/src/qml/qml.pro
-index e30c39c..f4862a1 100644
---- a/src/qml/qml.pro
-+++ b/src/qml/qml.pro
-@@ -16,6 +16,11 @@ exists("qqml_enable_gcov") {
-     LIBS_PRIVATE += -lgcov
- }
- 
-+greaterThan(QT_GCC_MAJOR_VERSION, 5) {
-+    # Our code is bad. Temporary workaround.
-+    QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
-+}
-+
- QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
- 
- # 2415: variable "xx" of static storage duration was declared but never referenced
--- 
-1.9.3
-

qt5-qtdeclarative.spec

@@ -24,8 +24,8 @@
 
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
-Version: 5.6.0
+Version: 5.6.1
-Release: 12%{?prerelease:.%{prerelease}}%{?dist}
+Release: 1%{?prerelease:.%{prerelease}}%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -42,10 +42,6 @@ Patch1: qtdeclarative-opensource-src-5.5.0-no_sse2.patch
 Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch
 
 ## upstream patches
-Patch8: 0008-Fix-crash-when-Canvas-has-negative-width-or-height.patch
-Patch19: 0019-Revert-Fix-crash-on-QQmlEngine-destruction.patch
-Patch29: 0029-Avoid-div-by-zero-when-nothing-is-rendered.patch
-Patch135: 0135-Workaround-for-crashes-in-QtQml-code-relating-to-nul.patch
 
 ## upstreamable patches
 # use system double-conversation
@@ -126,11 +122,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %endif
 %patch2 -p1 -b .QQuickShaderEffectSource_deadlock
 
-%patch8 -p1 -b .0008
-%patch19 -p1 -b .0019
-%patch29 -p1 -b .0029
-%patch135 -p1 -b .0135
-
 %if 0%{?system_doubleconv}
 %patch200 -p1 -b .system_doubleconv
 rm -rfv src/3rdparty/double-conversion
@@ -276,7 +267,10 @@ make check -k -C %{_target_platform}/tests ||:
 
 
 %changelog
-* Thu Jun 02 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-12
+* Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
+- Update to 5.6.1
+
+* Thu Jun 02 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-12
 - pull in upstream qml/jsruntime workaround (ie, apply compiler workarounds only for src/qml/)
 
 * Tue May 31 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-11

sources

@@ -1 +1 @@
-4cb03d616533933557c6ccf2620e809b  qtdeclarative-opensource-src-5.6.0.tar.xz
+ea2a2602b8a91f2618a36be09bcd79e9  qtdeclarative-opensource-src-5.6.1.tar.xz