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

[Lisandro Damián Nicanor Pérez]

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

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

    Add arm64.patch to properly detect the arch.
---
 debian/changelog           |  2 ++
 debian/patches/arm64.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fcc12a6..0f73bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qtwebkit (2.3.2.dfsg-3) UNRELEASED; urgency=medium
   * Update symbols files with buildds' logs.
   * Add x32_support.patch to support x32 (Closes: #700093).
     - Also disable JIT on x32.
+  * Add arm64.patch (taken from Ubuntu's aarch64.patch) and modify it to
+    properly detect arm64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 04 Sep 2014 20:42:51 -0300
 
diff --git a/debian/patches/arm64.patch b/debian/patches/arm64.patch
new file mode 100644
index 0000000..7caa197
--- /dev/null
+++ b/debian/patches/arm64.patch
@@ -0,0 +1,44 @@
+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 b4093fa..9fb0441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ reduce_memory_usage.patch
 ppc64el.patch
 bound_cpu_usage.patch
 x32_support.patch
+arm64.patch

-- 
QtWebKit packaging