[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-beta2-1-2-gc9a6935

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=c9a6935

The following commit has been merged in the experimental branch:
commit c9a6935652f139597a52b05a6ff80bca9c058401
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri May 5 16:43:39 2017 +0300

    Backport proposed upstream fix for build failure on non-JIT archs.
---
 debian/changelog                           |  3 +++
 debian/patches/qv4isel_always_export.patch | 37 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 360b126..a025505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 qtdeclarative-opensource-src (5.9.0~beta3-1) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
   * New upstream release.
+  * Backport proposed upstream fix for build failure on non-JIT archs
+    (qv4isel_always_export.patch).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 May 2017 16:39:46 +0300
 
diff --git a/debian/patches/qv4isel_always_export.patch b/debian/patches/qv4isel_always_export.patch
new file mode 100644
index 0000000..7962a6f
--- /dev/null
+++ b/debian/patches/qv4isel_always_export.patch
@@ -0,0 +1,37 @@
+Description: build fix for architectures where we don’t support the JIT
+Author: Simon Hausmann <simon.hausmann at qt.io>
+Origin: https://codereview.qt-project.org/193778
+Last-Update: 2017-05-05
+
+--- a/src/qml/jit/qv4isel_masm.cpp
++++ b/src/qml/jit/qv4isel_masm.cpp
+@@ -1633,6 +1633,8 @@
+     return result;
+ }
+ 
++#endif // ENABLE(ASSEMBLER)
++
+ QT_BEGIN_NAMESPACE
+ namespace QV4 { namespace JIT {
+ template class Q_QML_EXPORT InstructionSelection<>;
+@@ -1641,6 +1643,7 @@
+ 
+ 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>>;
+ 
+@@ -1661,6 +1664,7 @@
+ #endif
+     if (!hostArch.isEmpty() && architecture == hostArch)
+         return new ISelFactory<>;
++#endif // ENABLE(ASSEMBLER)
+ 
+     return nullptr;
+ }
+@@ -1669,4 +1673,3 @@
+ } }
+ QT_END_NAMESPACE
+ 
+-#endif // ENABLE(ASSEMBLER)
diff --git a/debian/patches/series b/debian/patches/series
index 71cb1c0..3291798 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 disableopengltests.patch
 fix_test_remove_qlibraryinfo.patch
 Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
+qv4isel_always_export.patch

-- 
qtdeclarative packaging