From f87fc78339a10fb8cb9b3a468341fe6efc254758 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <david.abdurachmanov@gmail.com>
Date: Sat, 2 Jun 2018 17:29:11 +0200
Subject: [PATCH] Apply workaround for JSValue.h

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
---
 qtwebkit.spec                    |  3 +++
 webkit-qtwebkit-23-riscv64.patch | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/qtwebkit.spec b/qtwebkit.spec
index e80b0fb..7f2d3a6 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -183,6 +183,9 @@ WEBKITOUTPUTDIR=`pwd`; export WEBKITOUTPUTDIR
   --qmakearg="CONFIG+=production_build DEFINES+=HAVE_LIBWEBP=1" \
   --makeargs="%{?_smp_mflags}" \
   --system-malloc \
+%ifarch riscv64
+  --disable-jit \
+%endif
   --no-force-sse2
 popd
 %endif
diff --git a/webkit-qtwebkit-23-riscv64.patch b/webkit-qtwebkit-23-riscv64.patch
index 0efbf8d..79777a6 100644
--- a/webkit-qtwebkit-23-riscv64.patch
+++ b/webkit-qtwebkit-23-riscv64.patch
@@ -23,6 +23,25 @@ index 0a7a8bd3..14fbcdbf 100644
  ELSE ()
      MESSAGE(FATAL_ERROR "Unknown CPU")
  ENDIF ()
+diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
+index e5f4362c..f175d09e 100644
+--- a/Source/JavaScriptCore/JavaScriptCore.pri
++++ b/Source/JavaScriptCore/JavaScriptCore.pri
+@@ -37,6 +37,14 @@ macx: INCLUDEPATH += $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$activeBuildConfig(
+ 
+ win32-*: LIBS += -lwinmm
+ 
++# Hack around RISCV64 fail wrt JSValue.h
++# SValue.h unconditionally casts pointer to int32_t.
++# add -fpermissive locally as a workaround
++equals(QT_ARCH, riscv64) {
++    message("JavaScriptCore riscv64 hack: -fpermissive")
++    QMAKE_CXXFLAGS += -fpermissive
++}
++
+ wince* {
+     INCLUDEPATH += $$QT.core.sources/../3rdparty/ce-compat
+     INCLUDEPATH += $$SOURCE_DIR/os-win32
 diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
 index 56c6f256..cdcc94c6 100644
 --- a/Source/WTF/wtf/Platform.h