[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.1-2-2-g4fdfb79

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 4fdfb79fe243396a1f16eea8506680a5a1185bcc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jul 31 17:44:39 2017 -0300

    Disable JIT on MIPS*
    
    Until upstream fixes the FTBFS.
---
 debian/changelog                         |  4 ++++
 debian/patches/disable_jit_on_mips.patch | 18 ++++++++++++++++++
 debian/patches/jit_only_mipsel.diff      | 16 ----------------
 debian/patches/series                    |  2 +-
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 957cfd3..aa8dc8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtdeclarative-opensource-src (5.9.1-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Due to QTBUG-58567 we are forced to turn off JIT on mips* until
+    upstream solves this issue.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 31 Jul 2017 17:34:59 -0300
 
 qtdeclarative-opensource-src (5.9.1-2) experimental; urgency=medium
diff --git a/debian/patches/disable_jit_on_mips.patch b/debian/patches/disable_jit_on_mips.patch
new file mode 100644
index 0000000..6e9b0e9
--- /dev/null
+++ b/debian/patches/disable_jit_on_mips.patch
@@ -0,0 +1,18 @@
+Description: Disable JIT on MIPS*
+ Due to QTBUG-58567 we need to disable JIT on mips* in order
+ to be able to go forward with Qt on Debian.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: not-needed
+Last-Update: 2017-07-31
+
+--- a/src/qml/jsruntime/qv4global_p.h
++++ b/src/qml/jsruntime/qv4global_p.h
+@@ -107,7 +107,7 @@
+ #  if defined(Q_OS_LINUX)
+ #    define V4_ENABLE_JIT
+ #  endif
+-#elif defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX)
++#elif defined(Q_PROCESSOR_MIPS_32) && 0
+ #  define V4_ENABLE_JIT
+ #endif
+ 
diff --git a/debian/patches/jit_only_mipsel.diff b/debian/patches/jit_only_mipsel.diff
deleted file mode 100644
index e13af35..0000000
--- a/debian/patches/jit_only_mipsel.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: of all MIPS architectures, JIT should be only enabled on mipsel
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-yet
-Last-Update: 2017-07-05
-
---- a/src/qml/jsruntime/qv4global_p.h
-+++ b/src/qml/jsruntime/qv4global_p.h
-@@ -107,7 +107,7 @@
- #  if defined(Q_OS_LINUX)
- #    define V4_ENABLE_JIT
- #  endif
--#elif defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX)
-+#elif defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX) && Q_BYTE_ORDER == Q_LITTLE_ENDIAN && _MIPS_SIM == _ABIO32
- #  define V4_ENABLE_JIT
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index 62271e6..54533b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@
 disableopengltests.patch
 fix_test_remove_qlibraryinfo.patch
 Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
-jit_only_mipsel.diff
+disable_jit_on_mips.patch

-- 
qtdeclarative packaging