diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index d09fc55..93be213 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -33,6 +33,9 @@ Patch3: qtdeclarative-opensource-src-5.9.0-v4bootstrap.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$ @@ -86,6 +89,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %patch2 -p1 -b .QQuickShaderEffectSource_deadlock %patch3 -p1 -b .v5boot %patch201 -p0 -b .kdebug346118 +%patch202 -p1 -b .nojitsupport %build diff --git a/qtdeclarative-opensource-src-5.9.0-beta3-nojitsupport.patch b/qtdeclarative-opensource-src-5.9.0-beta3-nojitsupport.patch new file mode 100644 index 0000000..9f18a99 --- /dev/null +++ b/qtdeclarative-opensource-src-5.9.0-beta3-nojitsupport.patch @@ -0,0 +1,58 @@ +From 7730affa0dd50960da90f30d41b694a9e9ddd52b Mon Sep 17 00:00:00 2001 +From: Simon Hausmann +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 +Reviewed-by: Robin Burchell +--- + 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 ISelFactory::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>; + using ARM64CrossAssembler = QV4::JIT::Assembler>; + +@@ -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 +