[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-2-8-g3ee9038

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 3ee9038b3648a91d36aacfd8fb6017ee34bd8266
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 5 14:42:07 2014 -0300

    Add x32_support.patch to support x32 (Closes: #700093).
---
 debian/changelog                 |  1 +
 debian/patches/series            |  1 +
 debian/patches/x32_support.patch | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 74227d6..74ca594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtwebkit (2.3.2.dfsg-3) UNRELEASED; urgency=medium
   * Bound CPU usage on unknown platforms with bound_cpu_usage.patch
     (Closes: #760519). Thanks Samuel Thibault for the patch.
   * Update symbols files with buildds' logs.
+  * Add x32_support.patch to support x32 (Closes: #700093).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 04 Sep 2014 20:42:51 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index e173d43..b4093fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ double_conversion_correct_double_operations.patch
 reduce_memory_usage.patch
 ppc64el.patch
 bound_cpu_usage.patch
+x32_support.patch
diff --git a/debian/patches/x32_support.patch b/debian/patches/x32_support.patch
new file mode 100644
index 0000000..7a47185
--- /dev/null
+++ b/debian/patches/x32_support.patch
@@ -0,0 +1,24 @@
+Description: add x32 support
+ and disable JIT support for it.
+Author: Daniel Schepler <dschepler at gmail.com>
+Bug-Debian: 700093
+
+---
+ Source/WTF/wtf/Platform.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -163,8 +163,12 @@
+ /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
+ #if   defined(__x86_64__) \
+     || defined(_M_X64)
++#ifdef __ILP32__
++#define WTF_CPU_X86_64_32 1
++#else
+ #define WTF_CPU_X86_64 1
+ #endif
++#endif
+ 
+ /* CPU(ARM) - ARM, any version*/
+ #if   defined(arm) \

-- 
QtWebKit packaging