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

[Lisandro Damián Nicanor Pérez]

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

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

    Also remove disable_jit_llint.diff with the same purpose.
---
 debian/changelog                      |  1 +
 debian/patches/disable_jit_llint.diff | 19 -------------------
 debian/patches/series                 |  1 -
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae140be..825226d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit-opensource-src (5.2.1+dfsg-2) UNRELEASED; urgency=medium
   * Backport fix_ftbfs_in_archs_without_jit_support.patch to fix FTBFSs in
     archs without JIT support.
   * Remove code in debian/rules that tried to fix the above unsuccessfully.
+  * Also remove disable_jit_llint.diff with the same purpose.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Feb 2014 13:21:40 -0300
 
diff --git a/debian/patches/disable_jit_llint.diff b/debian/patches/disable_jit_llint.diff
deleted file mode 100644
index f3cd8c0..0000000
--- a/debian/patches/disable_jit_llint.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: disable JIT and llint on ia64, s390, sparc and mips
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Forwarded: no
-Last-Update: 2014-01-05
-
---- a/Source/JavaScriptCore/Target.pri
-+++ b/Source/JavaScriptCore/Target.pri
-@@ -18,6 +18,11 @@ CONFIG += staticlib
- *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
- *-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
- 
-+# 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
-+}
-+
- # 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) {
diff --git a/debian/patches/series b/debian/patches/series
index cb7c249..b2e81a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ stabs_format_debug_info.diff
 no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
-disable_jit_llint.diff

-- 
qt5webkit packaging