[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-4-15-gd1cfac9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit d1cfac98018bd4545b7c067b344d1af5b8944bd1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 29 17:17:39 2014 -0300

    Remove x32_support.patch
    
    A similar code has been applied upstream.
---
 debian/changelog                 |  1 +
 debian/patches/series            |  1 -
 debian/patches/x32_support.patch | 24 ------------------------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be9e291..e3fd1d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtwebkit (2.3.4.dfsg-1) UNRELEASED; urgency=medium
     - double_conversion_correct_double_operations.patch
     - ppc64el.patch
     - gstreamer-1.0.diff
+    - x32_support.patch
   * Refresh patches.
   * Update glibc_hurd_mkspecs.diff. I removed the first part of the patch
     because now the source uses unix* which should work. The rest was just a
diff --git a/debian/patches/series b/debian/patches/series
index b4a14ea..baa1b33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,7 +16,6 @@ hide_wtf_symbols.diff
 hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff
 reduce_memory_usage.patch
-x32_support.patch
 arm64.patch
 hppa_support.patch
 nonlinux_enable_glib_support.patch
diff --git a/debian/patches/x32_support.patch b/debian/patches/x32_support.patch
deleted file mode 100644
index 7a47185..0000000
--- a/debian/patches/x32_support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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