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

[Lisandro Damián Nicanor Pérez]

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

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

    Remove arma64.patch
    
    Also applied upstream.
---
 debian/changelog           |  1 +
 debian/patches/arm64.patch | 44 --------------------------------------------
 debian/patches/series      |  1 -
 3 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3fd1d8..66b1a07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qtwebkit (2.3.4.dfsg-1) UNRELEASED; urgency=medium
     - ppc64el.patch
     - gstreamer-1.0.diff
     - x32_support.patch
+    - arm64.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/arm64.patch b/debian/patches/arm64.patch
deleted file mode 100644
index 7caa197..0000000
--- a/debian/patches/arm64.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Andreas Schwab <schwab at suse.de>
-Date: Mon, 13 May 2013 15:31:45 +0200
-Description: [PATCH] Add support for AAarch64
-  Modified by Lisandro D. N. Pérez Meyer <lisandro at debian.org>
-  The original patch also changed Source/WTF/wtf/dtoa/utils.h, but
-  we are already doing this on
-  double_conversion_correct_double_operations.patch
-Origin: backport, https://bugs.webkit.org/show_bug.cgi?id=116030
-Bug: https://bugs.webkit.org/show_bug.cgi?id=116030
-        * wtf/Platform.h: Add support for AArch64.
-Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Last-Update: 2014-09-05
-
----
- Source/WTF/wtf/Platform.h |   11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -324,6 +324,14 @@
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
- 
-+/* CPU(AARCH64) - AArch64 */
-+#if defined(__aarch64__)
-+#define WTF_CPU_AARCH64 1
-+#if defined(__AARCH64BE__)
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+#endif
-+
- /* ==== OS() - underlying operating system; only to be used for mandated low-level services like 
-    virtual memory, not to choose a GUI toolkit ==== */
- 
-@@ -882,7 +890,8 @@
-     || CPU(ALPHA) \
-     || CPU(SPARC64) \
-     || CPU(S390X) \
--    || CPU(PPC64)
-+    || CPU(PPC64) \
-+    || CPU(AARCH64)
- #define WTF_USE_JSVALUE64 1
- #else
- #define WTF_USE_JSVALUE32_64 1
diff --git a/debian/patches/series b/debian/patches/series
index baa1b33..fc41878 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,6 +16,5 @@ hide_wtf_symbols.diff
 hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff
 reduce_memory_usage.patch
-arm64.patch
 hppa_support.patch
 nonlinux_enable_glib_support.patch

-- 
QtWebKit packaging