[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.0+dfsg-2-3-g7c54233

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 7c54233b8d01873efe55b25394a142c3c57ca9f2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 10 21:18:18 2014 -0300

    Change latest Dmitry's patch as agreed on IRC.
    
    - Do not disable mips. It seems supported upstream, so the problem here
    comes from somewhere else.
    
    - To be on the safe side, undefine ENABLE_JIT=1 ENABLE_LLINT=1 before
    defining them to 0. Maybe this is unnecesary, if so, please feel free
    to tell me ;-)
---
 debian/changelog                      |  4 ++--
 debian/patches/disable_jit_llint.diff | 30 ++++--------------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d1d41d..9d1509f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 qtwebkit-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
-  * Add a patch (disable_jit_llint.diff) to disable JIT and llint on ia64, s390,
-    sparc and mips.
+  * Add a patch (disable_jit_llint.diff) to disable JIT and llint on ia64, s390
+    and sparc.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Jan 2014 22:35:45 +0400
 
diff --git a/debian/patches/disable_jit_llint.diff b/debian/patches/disable_jit_llint.diff
index 4936818..8fcaf0d 100644
--- a/debian/patches/disable_jit_llint.diff
+++ b/debian/patches/disable_jit_llint.diff
@@ -5,38 +5,16 @@ Last-Update: 2014-01-05
 
 --- a/Source/JavaScriptCore/Target.pri
 +++ b/Source/JavaScriptCore/Target.pri
-@@ -18,6 +18,11 @@
+@@ -18,6 +18,12 @@ CONFIG += staticlib
  *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
  *-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
  
-+# Disable JIT and llint on some archs
-+equals(QT_ARCH, ia64)|equals(QT_ARCH, s390)|equals(QT_ARCH, sparc)|equals(QT_ARCH, mips) {
++# Disable JIT and llint on archs where it FTBFS.
++equals(QT_ARCH, ia64)|equals(QT_ARCH, s390)|equals(QT_ARCH, sparc) {
++    DEFINES -= ENABLE_JIT=1 ENABLE_LLINT=1
 +    DEFINES += ENABLE_JIT=0 ENABLE_LLINT=0
 +}
 +
  # Rules when JIT enabled (not disabled)
  !contains(DEFINES, ENABLE_JIT=0) {
      linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -741,9 +741,9 @@
- #define ENABLE_JIT 1
- #endif
- 
--/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
-+/* The JIT is enabled by default on all x86, x86-64 & ARM platforms. */
- #if !defined(ENABLE_JIT) \
--    && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
-+    && (CPU(X86) || CPU(X86_64) || CPU(ARM)) \
-     && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
-     && !OS(WINCE) \
-     && !(OS(QNX) && !PLATFORM(QT)) /* We use JIT in QNX Qt */
-@@ -777,7 +777,7 @@
-     && ENABLE(JIT) \
-     && (OS(DARWIN) || OS(LINUX)) \
-     && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(QT)) \
--    && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(MIPS) || CPU(SH4))
-+    && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(SH4))
- #define ENABLE_LLINT 1
- #endif
- 

-- 
qt5webkit packaging