- Patch upstream

qt5-qtdeclarative.spec

@@ -39,9 +39,6 @@ Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch
 # use system double-conversation
 # https://bugs.kde.org/show_bug.cgi?id=346118#c108
 Patch201: qtdeclarative-kdebug346118.patch
-# To remove after beta 3
-Patch202: qtdeclarative-opensource-src-5.9.0-beta3-nojitsupport.patch
-
 
 # filter qml provides
 %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
@@ -94,8 +91,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %endif
 %patch2 -p1 -b .QQuickShaderEffectSource_deadlock
 %patch201 -p0 -b .kdebug346118
-%patch202 -p1 -b .nojitsupport
-
 
 %build
 mkdir %{_target_platform}

qtdeclarative-opensource-src-5.9.0-beta3-nojitsupport.patch

@@ -1,58 +0,0 @@
-From 7730affa0dd50960da90f30d41b694a9e9ddd52b Mon Sep 17 00:00:00 2001
-From: Simon Hausmann <simon.hausmann@qt.io>
-Date: Fri, 5 May 2017 15:21:40 +0200
-Subject: [PATCH] Prospective build fix for architectures where we don't
- support the JIT
-
-Always export the isel factory method for qmlcachegen, so that we can
-link.
-
-Task-number: QTBUG-60597
-Change-Id: Ia348ee5dfe0892878e8fce6c8afd30bb8eb54a51
-Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
-Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
----
- src/qml/jit/qv4isel_masm.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp
-index 4afcd1517..ac72d2e8f 100644
---- a/src/qml/jit/qv4isel_masm.cpp
-+++ b/src/qml/jit/qv4isel_masm.cpp
-@@ -1631,14 +1631,20 @@ QQmlRefPointer<CompiledData::CompilationUnit> ISelFactory<JITAssembler>::createU
-     return result;
- }
- 
-+#endif // ENABLE(ASSEMBLER)
-+
- QT_BEGIN_NAMESPACE
- namespace QV4 { namespace JIT {
-+#if ENABLE(ASSEMBLER)
- template class Q_QML_EXPORT InstructionSelection<>;
- template class Q_QML_EXPORT ISelFactory<>;
-+#endif
-+
- #if defined(V4_BOOTSTRAP)
- 
- Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture)
- {
-+#if ENABLE(ASSEMBLER)
-     using ARMv7CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARMv7, NoOperatingSystemSpecialization>>;
-     using ARM64CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARM64, NoOperatingSystemSpecialization>>;
- 
-@@ -1659,6 +1665,7 @@ Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &arch
- #endif
-     if (!hostArch.isEmpty() && architecture == hostArch)
-         return new ISelFactory<>;
-+#endif // ENABLE(ASSEMBLER)
- 
-     return nullptr;
- }
-@@ -1667,4 +1674,3 @@ Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &arch
- } }
- QT_END_NAMESPACE
- 
--#endif // ENABLE(ASSEMBLER)
--- 
-2.12.2
-