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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 74abfd3dc1e9b1a438cf300647ad844780a3a737
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Oct 14 16:07:00 2014 -0300

    Backport do_not_use_jit_on_big_endian_machines.patch
---
 debian/changelog                                   |  1 +
 .../do_not_use_jit_on_big_endian_machines.patch    | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 48b1220..390f41f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtwebkit (2.3.4.dfsg-3) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Backport fix_cloop_on_big_endian_machines.patch (Closes: #761040).
+  * Backport do_not_use_jit_on_big_endian_machines.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 14 Oct 2014 15:59:06 -0300
 
diff --git a/debian/patches/do_not_use_jit_on_big_endian_machines.patch b/debian/patches/do_not_use_jit_on_big_endian_machines.patch
new file mode 100644
index 0000000..3bc235a
--- /dev/null
+++ b/debian/patches/do_not_use_jit_on_big_endian_machines.patch
@@ -0,0 +1,41 @@
+From 0b6f959022700ecf9374bdbb13772242d3f7e617 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at digia.com>
+Date: Fri, 10 Oct 2014 14:50:18 +0200
+Subject: [PATCH] Do not use JIT on big endian architectures
+
+All the JIT implementations targets the little-endian versions of ARM,
+MIPS and SH4 respectively. So in case anyone builds on those platforms
+we should not enable JIT.
+
+Task-number: QTBUG-41896
+Change-Id: I5be167511e2c3eac6c63e603b82da84fb6b29eaa
+Reviewed-by: Julien Brianceau <jbriance at cisco.com>
+Reviewed-by: Michael Bruning <michael.bruning at digia.com>
+---
+ Source/WTF/wtf/Platform.h |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -133,6 +133,9 @@
+ /* CPU(SH4) - SuperH SH-4 */
+ #if defined(__SH4__)
+ #define WTF_CPU_SH4 1
++#ifdef __BIG_ENDIAN__
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
+ #endif
+ 
+ /* CPU(SPARC32) - SPARC 32-bit */
+@@ -918,6 +921,11 @@
+ #define ENABLE_JIT 0
+ #endif
+ 
++/* All the current JIT implementations target little-endian */
++#if CPU(BIG_ENDIAN)
++#define ENABLE_JIT 0
++#endif
++
+ /* Disable JIT on x32 */
+ #if CPU(X32)
+ #define ENABLE_JIT 0
diff --git a/debian/patches/series b/debian/patches/series
index 626fbd6..45b8f10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 # upstream patches
 jsobject_ensure_indexingtype_should_handle_InterceptsGetOwn.patch
 fix_linking_issue_on_some_platforms_when_building_against_gstreamer_1.0.patch
+do_not_use_jit_on_big_endian_machines.patch
 fix_cloop_on_big_endian_machines.patch
 
 # debian patches

-- 
QtWebKit packaging