Bug#757639: qtwebkit: FTBFS on arm64
Package: qtwebkit
Version: 2.2.1-7
Severity: serious
Tags: upstream patch
Justification: fails to build from source (but built successfully in the past)
User: debian-arm@lists.debian.org
Usertag: arm64
qtwebkit does not build on arm64 (which is (just) now in the main
archive). The simple attached patch fixes this issue. It was actually
done a couple of months ago but I apparently failed to file this bug,
mostly because there were two versions upstream and I thought I should
check both out.
I see there has been an NMU since then. I'll check that this still
works OK with that. Then plan to do an NMU in order to unblock arm64 builds.
Wookey
diff -Nru qtwebkit-2.2.1/debian/changelog qtwebkit-2.2.1/debian/changelog
--- qtwebkit-2.2.1/debian/changelog 2013-11-05 01:15:31.000000000 +0000
+++ qtwebkit-2.2.1/debian/changelog 2014-06-08 00:20:13.000000000 +0000
@@ -1,3 +1,10 @@
+qtwebkit (2.2.1-7+arm64) unreleased; urgency=low
+
+ * Non-maintainer upload.
+ * Add basic arm64/aarch64 support
+
+ -- Wookey <wookey@debian.org> Sun, 08 Jun 2014 00:19:24 +0000
+
qtwebkit (2.2.1-7) unstable; urgency=low
[ Nobuhiro Iwamatsu ]
diff -Nru qtwebkit-2.2.1/debian/patches/arm64-support.diff qtwebkit-2.2.1/debian/patches/arm64-support.diff
--- qtwebkit-2.2.1/debian/patches/arm64-support.diff 1970-01-01 00:00:00.000000000 +0000
+++ qtwebkit-2.2.1/debian/patches/arm64-support.diff 2014-06-08 00:41:24.000000000 +0000
@@ -0,0 +1,33 @@
+Description: Add arm64/aarch64 support
+ Add basic aarch64 suport
+Author: Wookey <wookey@debian.org>
+Origin: Linaro, https://bugs.launchpad.net/linaro-aarch64/+bug/1096053/+attachment/3482961/+files/aarch64.patch
+Bug: https://bugs.launchpad.net/linaro-aarch64/+bug/1096053
+Last-Update: <2014-06-07
+
+Index: qtwebkit-2.2.1/Source/JavaScriptCore/wtf/Platform.h
+===================================================================
+--- qtwebkit-2.2.1.orig/Source/JavaScriptCore/wtf/Platform.h
++++ qtwebkit-2.2.1/Source/JavaScriptCore/wtf/Platform.h
+@@ -369,6 +369,11 @@
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+
++/* CPU(AARCH64) - Aarch64 */
++#if defined(__aarch64__)
++#define WTF_CPU_AARCH64 1
++#endif
++
+ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
+ virtual memory, not to choose a GUI toolkit ==== */
+
+@@ -998,7 +1003,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 -Nru qtwebkit-2.2.1/debian/patches/series qtwebkit-2.2.1/debian/patches/series
--- qtwebkit-2.2.1/debian/patches/series 2013-07-24 03:29:27.000000000 +0000
+++ qtwebkit-2.2.1/debian/patches/series 2014-06-08 00:38:36.000000000 +0000
@@ -18,3 +18,4 @@
hurd.diff
webkit_qt_hide_symbols.diff
ignore-unused-local-typedefs_error.diff
+arm64-support.diff
Reply to: