[SCM] QtWebKit packaging branch, master, updated. debian/2.3.4.dfsg-7-2-gbe70353

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit be70353721c0d1a299d112df00bfa365ad57c690
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 21 17:43:50 2016 -0300

    Disable JIT use on non-SSE2 capable machines.
---
 debian/changelog                         |  4 ++++
 debian/patches/disable-jit-nonsse2.patch | 14 ++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 79d2f60..e51f1eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebkit (2.3.4.dfsg-8) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Disable JIT use on non-SSE2 capable machines (Closes: #824663). Thanks
+    Peter Nowee!
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 21 May 2016 17:37:14 -0300
 
 qtwebkit (2.3.4.dfsg-7) unstable; urgency=medium
diff --git a/debian/patches/disable-jit-nonsse2.patch b/debian/patches/disable-jit-nonsse2.patch
new file mode 100644
index 0000000..4e64959
--- /dev/null
+++ b/debian/patches/disable-jit-nonsse2.patch
@@ -0,0 +1,14 @@
+--- a/Source/JavaScriptCore/runtime/JSGlobalData.cpp
++++ b/Source/JavaScriptCore/runtime/JSGlobalData.cpp
+@@ -109,6 +109,11 @@ static bool enableAssembler(ExecutableAl
+     if (!executableAllocator.isValid() || (!Options::useJIT() && !Options::useRegExpJIT()))
+         return false;
+ 
++#if CPU(X86)
++    if (!MacroAssembler::supportsFloatingPoint())
++        return false;
++#endif
++
+ #if USE(CF)
+ #if COMPILER(GCC) && !COMPILER(CLANG)
+     // FIXME: remove this once the EWS have been upgraded to LLVM.
diff --git a/debian/patches/series b/debian/patches/series
index 12c9fca..4d35e0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ explicit_template_instantiation.patch
 redeclare_uint32_t_for_sparc64.patch
 fix_number_of_cpus_in_kfreebsd.diff
 fix_x32_cpu_detection.patch
+disable-jit-nonsse2.patch

-- 
QtWebKit packaging