[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.1+dfsg-1-3-g904aaee

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 96bdf44b98a44263a0fcffb063f3b2895cbb7d1c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Feb 21 13:22:56 2014 -0300

    Backport fix_ftbfs_in_archs_without_jit_support.patch
---
 debian/changelog                                   |  4 ++
 .../fix_ftbfs_in_archs_without_jit_support.patch   | 51 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1e56f51..745f01c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebkit-opensource-src (5.2.1+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Backport fix_ftbfs_in_archs_without_jit_support.patch to fix FTBFSs in
+    archs without JIT support.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Feb 2014 13:21:40 -0300
 
 qtwebkit-opensource-src (5.2.1+dfsg-1) experimental; urgency=medium
diff --git a/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch b/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch
new file mode 100644
index 0000000..433d348
--- /dev/null
+++ b/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch
@@ -0,0 +1,51 @@
+From 433796d860326e4ffa344fd2b361f332470ad357 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at digia.com>
+Date: Fri, 21 Feb 2014 15:12:45 +0100
+Subject: [PATCH] Fix Qt WebKit build on architectures without JIT support
+
+The fallback LLINT interpreter was triggering YARR JIT which would
+fail to compile and also trigger ENABLE_ASSEMBLER which would trigger
+even more not to compile. YARR JIT is only supported on platforms with
+valid JIT or native LLINT support. So we must avoid it when the fallback
+is used
+
+Task-number: QTBUG-36969
+Change-Id: Ie94bcb316e192feb33ab528ddc3a328af154cebf
+---
+ Source/JavaScriptCore/bytecode/CodeBlock.cpp | 4 ++++
+ Source/WTF/wtf/Platform.h                    | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+index 904e40a..efe4424 100644
+--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
++++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+@@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization()
+ 
+ unsigned CodeBlock::numberOfDFGCompiles()
+ {
++#if ENABLE(JIT)
+     ASSERT(JITCode::isBaselineCode(getJITType()));
+     return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter;
++#else
++    return 0;
++#endif
+ }
+ 
+ int32_t CodeBlock::codeTypeThresholdMultiplier() const
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 1ad7a47..cf80b76 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -889,7 +889,7 @@
+ #define ENABLE_REGEXP_TRACING 0
+ 
+ /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
+-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT))
++#if !defined(ENABLE_YARR_JIT) && !ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT))
+ #define ENABLE_YARR_JIT 1
+ 
+ /* Setting this flag compares JIT results with interpreter results. */
+-- 
+1.9.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 7b42e59..cb7c249 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+# Upstream patches
+fix_ftbfs_in_archs_without_jit_support.patch
+
 # debian patches
 05_sparc_unaligned_access.diff
 stabs_format_debug_info.diff

-- 
qt5webkit packaging