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

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Feb 21 16:29:27 UTC 2014


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

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

    Refresh patch to use it in this version of the code.
---
 debian/patches/fix_ftbfs_in_archs_without_jit_support.patch | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch b/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch
index 433d348..27965ed 100644
--- a/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch
+++ b/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch
@@ -16,8 +16,6 @@ Change-Id: Ie94bcb316e192feb33ab528ddc3a328af154cebf
  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()
@@ -33,11 +31,9 @@ index 904e40a..efe4424 100644
  }
  
  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 @@
+@@ -872,7 +872,7 @@
  #define ENABLE_REGEXP_TRACING 0
  
  /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
@@ -46,6 +42,3 @@ index 1ad7a47..cf80b76 100644
  #define ENABLE_YARR_JIT 1
  
  /* Setting this flag compares JIT results with interpreter results. */
--- 
-1.9.0
-

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list