Bug#901566: qtwebkit: Please add support for architecture "riscv64"
Source: qtwebkit
Version: 2.3.4.dfsg-9.1
Severity: normal
Tags: patch upstream
User: debian-riscv@lists.debian.org
Usertags: riscv64
Hi,
I know that you want this package removed soonish [1].
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876905
However, until it gets removed from the archive and because still many packages
directly build-depend on it, it's a problem for new ports, because it blocks a
substantial part of the archive from being built.
I cannot recall all the packages right now, since I was working on this a few
weeks ago and had to stop for a bit, but it blocks many dozens or hundreds of
packages among direct and indirect packages, sometimes very remotely related to
this source package, but nevertheless affected.
We have this package in the suite "unreleased"; as long as there are no more
uploads, we're good. But if there are new uploads with version >= 9.2, it can
break things for us.
So please consider including support for this architecture by applying the
attached patch if you upload new versions.
BTW, I think that we already submitted support for this upstream (or if not,
we'll do it over the next weeks), but I suspect that this package will not get
new upstream releases, so adding the patch directly is the only option in this
case.
Thanks and cheers.
--
Manuel A. Fernandez Montecelo <mafm@debian.org>
diff -Nru qtwebkit-2.3.4.dfsg/debian/changelog qtwebkit-2.3.4.dfsg/debian/changelog
--- qtwebkit-2.3.4.dfsg/debian/changelog 2016-11-23 11:46:11.000000000 +0100
+++ qtwebkit-2.3.4.dfsg/debian/changelog 2018-05-04 22:40:02.000000000 +0200
@@ -1,3 +1,10 @@
+qtwebkit (2.3.4.dfsg-9.1+0.riscv64.1) unreleased; urgency=medium
+
+ * Non-maintainer upload.
+ * riscv64: add support
+
+ -- Manuel A. Fernandez Montecelo <mafm@localhost> Fri, 04 May 2018 20:40:02 +0000
+
qtwebkit (2.3.4.dfsg-9.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru qtwebkit-2.3.4.dfsg/debian/patches/riscv64-support.patch qtwebkit-2.3.4.dfsg/debian/patches/riscv64-support.patch
--- qtwebkit-2.3.4.dfsg/debian/patches/riscv64-support.patch 1970-01-01 01:00:00.000000000 +0100
+++ qtwebkit-2.3.4.dfsg/debian/patches/riscv64-support.patch 2018-05-04 22:40:02.000000000 +0200
@@ -0,0 +1,47 @@
+Index: qtwebkit-2.3.4.dfsg/Source/WTF/wtf/Platform.h
+===================================================================
+--- qtwebkit-2.3.4.dfsg.orig/Source/WTF/wtf/Platform.h
++++ qtwebkit-2.3.4.dfsg/Source/WTF/wtf/Platform.h
+@@ -345,13 +345,20 @@
+ #endif
+ #endif
+
++/* CPU(RISCV64) - RISC-V 64 */
++#if defined(__riscv) && (__riscv_xlen == 64)
++#define WTF_CPU_RISCV64 1
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#endif
++
+ /* CPU(M68K) - m68k */
+ #if defined(__mc68000__)
+ #define WTF_CPU_M68K 1
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64)
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(RISCV64)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+
+@@ -914,6 +921,7 @@
+ || CPU(SPARC64) \
+ || CPU(S390X) \
+ || CPU(AARCH64) \
++ || CPU(RISCV64) \
+ || CPU(MIPS64) \
+ || CPU(PPC64)
+ #define WTF_USE_JSVALUE64 1
+Index: qtwebkit-2.3.4.dfsg/Source/WTF/wtf/dtoa/utils.h
+===================================================================
+--- qtwebkit-2.3.4.dfsg.orig/Source/WTF/wtf/dtoa/utils.h
++++ qtwebkit-2.3.4.dfsg/Source/WTF/wtf/dtoa/utils.h
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64) || CPU(HPPA) || CPU(RISCV64)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
diff -Nru qtwebkit-2.3.4.dfsg/debian/patches/series qtwebkit-2.3.4.dfsg/debian/patches/series
--- qtwebkit-2.3.4.dfsg/debian/patches/series 2016-11-17 22:20:52.000000000 +0100
+++ qtwebkit-2.3.4.dfsg/debian/patches/series 2018-05-04 22:34:46.000000000 +0200
@@ -26,3 +26,4 @@
fix_x32_cpu_detection.patch
disable-jit-nonsse2.patch
m68k_support.diff
+riscv64-support.patch
Reply to: