Add support for RISC-V (riscv64)

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
2018-06-22 09:54:35 +02:00
9 changed files with 228 additions and 127 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,2 @@
 /qtwebkit-opensource-src-5.9.0.tar.xz
 /qtwebkit-5.212.0-alpha2.tar.xz
-/qtwebkit-5.212.0-alpha3.tar.xz
--- a/0031-Disable-ES6-Proxy-object.patch
+++ b/0031-Disable-ES6-Proxy-object.patch
@ -0,0 +1,24 @@
+From 5648446933f52fe479d0a9006f6393a81a790116 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Thu, 25 May 2017 00:49:22 +0300
+Subject: [PATCH 031/143] Disable ES6 Proxy object
+
+Change-Id: Ifd6404e254b242afa8dd563c03f9588b4b05ab93
+---
+ Source/JavaScriptCore/runtime/JSGlobalObject.cpp   |   3 +
+ 91 files changed, 17 insertions(+), 1379 deletions(-)
+diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
+index 9e613a21215..7d57590b4c5 100644
+--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
+@@ -458,7 +458,10 @@ m_ ## lowerName ## Prototype->putDirectWithoutTransition(vm, vm.propertyNames->c
+     putDirectWithoutTransition(vm, vm.propertyNames->TypeError, m_typeErrorConstructor.get(), DontEnum);
+     putDirectWithoutTransition(vm, vm.propertyNames->URIError, m_URIErrorConstructor.get(), DontEnum);
+ 
+#if !PLATFORM(QT)
+    // Disable ES6 Proxy because our implementation is not compliant with what real world code expects
+     putDirectWithoutTransition(vm, vm.propertyNames->Proxy, ProxyConstructor::create(vm, ProxyConstructor::createStructure(vm, this, m_functionPrototype.get())), DontEnum);
+#endif
+     
+     
+ #define PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \
--- a/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch
+++ b/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch
@ -0,0 +1,12 @@
+diff -Naur qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
+--- qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp	2017-10-23 17:25:58.941518553 +0200
+++ qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp	2017-10-23 17:27:44.223917497 +0200
+@@ -961,6 +961,8 @@
+     FrameView* view = frame->view();
+     ASSERT(view);
+     view->resize(size);
+    if (view->needsLayout())
+        view->layout();
+     view->adjustViewSize();
+ }
+ 
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@ -1,10 +1,9 @@
-%undefine _annotated_build

 %global qt_module qtwebkit

 %global _hardened_build 1

-%global prerel alpha3
+%global prerel alpha2
 %global prerel_tag -%{prerel}

 ## NOTE: Lots of files in various subdirectories have the same name (such as
@ -16,24 +15,38 @@

 Name:           qt5-%{qt_module}
 Version:        5.212.0
-Release:        0.43.%{?prerel}%{?dist}
+Release:        0.23.%{?prerel}.0.riscv64%{?dist}
 Summary:        Qt5 - QtWebKit components

 License:        LGPLv2 and BSD
-URL:            https://github.com/qtwebkit/qtwebkit
-Source0:        https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz
+URL:            https://github.com/annulen/webkit
+Source0:        %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz
+
+# Upstream patch to fix pagewidth issue with trojita
+# https://github.com/annulen/webkit/issues/511
+# https://github.com/annulen/webkit/commit/6faf11215e1af27d35e921ae669aa0251a01a1ab
+# https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55
+Patch0:         qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch
+
+# Patch from Kevin Kofler to fix https://github.com/annulen/webkit/issues/573
+Patch1:         qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch

 # Patch for new CMake policy CMP0071 to explicitly use old behaviour.
 Patch2:         qtwebkit-5.212.0_cmake_cmp0071.patch
-Patch3:         qtwebkit-missing-semicolons.patch
+
+# Patch to fix for missing source file.
+Patch3:         qtwebkit-5.212.0_fix_missing_sources.patch
+
+# Enable RISC-V (riscv64)
+Patch4:         qtwebkit-5.212.0-alpha2-add-riscv.patch
+
+# disable ES6 Proxy
+Patch31: 0031-Disable-ES6-Proxy-object.patch

 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  pkgconfig(fontconfig)
-%if 0%{?rhel} != 8
-BuildRequires:  pkgconfig(libwoff2dec)
-%endif
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  gperf
@ -51,22 +64,18 @@ BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(gstreamer-gl-1.0)
 BuildRequires:  pkgconfig(gstreamer-mpegts-1.0)
 BuildRequires:  perl-generators
-BuildRequires:  perl(File::Copy)
 BuildRequires:  python2
 BuildRequires:  qt5-qtbase-devel
-BuildRequires:  qt5-qtdeclarative-devel
+BuildRequires:  pkgconfig(Qt5Quick)
 %if ! 0%{?bootstrap}
-BuildRequires:  qt5-qtlocation-devel
-BuildRequires:  qt5-qtsensors-devel
-BuildRequires:  qt5-qtwebchannel-devel
+BuildRequires:  pkgconfig(Qt5Location)
+BuildRequires:  pkgconfig(Qt5Sensors)
+BuildRequires:  pkgconfig(Qt5WebChannel)
 %endif
 BuildRequires:  pkgconfig(ruby)
 BuildRequires:  rubygems
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(zlib)
-# workaround bad embedded png files, https://bugzilla.redhat.com/1639422
-BuildRequires:  findutils
-BuildRequires:  pngcrush

 BuildRequires:  qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
@ -112,13 +121,6 @@ BuildArch: noarch
 %prep
 %autosetup -p1 -n %{qt_module}-%{version}%{?prerel_tag}

-# find/fix pngs with "libpng warning: iCCP: known incorrect sRGB profile"
-find -name \*.png | xargs -n1 pngcrush -ow -fix
-
-# ppc64le failed once with
-# make[2]: *** No rule to make target 'Source/WebCore/Resources/textAreaResizeCorner.png', needed by 'Source/WebKit/qrc_WebCore.cpp'.  Stop.
-test -f Source/WebCore/Resources/textAreaResizeCorner.png
-

 %build
 # The following changes of optflags ietc. are adapted from webkitgtk4 package, which
@ -131,7 +133,7 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png

 # Decrease debuginfo even on ix86 because of:
 # https://bugs.webkit.org/show_bug.cgi?id=140176
-%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips}
+%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips} riscv64
 # Decrease debuginfo verbosity to reduce memory consumption even more
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
@ -144,6 +146,11 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
 CXXFLAGS="${CXXFLAGS:-%optflags} -fpermissive" ; export CXXFLAGS ;
 %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}
+
+%ifarch riscv64
+export LDFLAGS="${LDFLAGS} -latomic"
+%endif
+
 # We cannot use default cmake macro here as it overwrites some settings queried
 # by qtwebkit cmake from qmake
 cmake -DPORT=Qt \
@ -152,7 +159,7 @@ cmake -DPORT=Qt \
       -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
       -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
       -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-%ifarch s390 s390x ppc %{power64}
+%ifarch s390 s390x ppc %{power64} riscv64
       -DENABLE_JIT=OFF \
 %endif
 %ifarch s390 s390x ppc %{power64}
@ -176,13 +183,12 @@ cmake -DPORT=Qt \
 find %{buildroot} -name '*.la' -exec rm -f {} ';'

 # fix pkgconfig files
-#sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
-#sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_headerdir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
-# strictly speaking, this isn't *wrong*, but can made more readable, so let's do that
+sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
+sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_headerdir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
 sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKit,Libs: -L%{_qt5_libdir} -lQt5WebKit ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc

-#sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
-#sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_headerdir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
+sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
+sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_headerdir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
 sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdir} -lQt5WebKitWidgets ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc

 # Finally, copy over and rename various files for %%license inclusion
@ -202,24 +208,22 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi
 %add_to_license_files Source/WTF/wtf/dtoa/LICENSE


-%check
-# verify Qt5WebKit cflags non-use of -I/.../Qt5WebKit
-export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
-test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
+%post -p /sbin/ldconfig

+%postun -p /sbin/ldconfig

-%ldconfig_scriptlets

 %files
 %license LICENSE.LGPLv21 _license_files/*
 %{_qt5_libdir}/libQt5WebKit.so.5*
 %{_qt5_libdir}/libQt5WebKitWidgets.so.5*
+%{_qt5_libexecdir}/QtWebDatabaseProcess
 %{_qt5_libexecdir}/QtWebNetworkProcess
 %{_qt5_libexecdir}/QtWebPluginProcess
 %{_qt5_libexecdir}/QtWebProcess
-%{_qt5_libexecdir}/QtWebStorageProcess
 %{_qt5_archdatadir}/qml/QtWebKit/

+
 %files devel
 %{_qt5_headerdir}/Qt*/
 %{_qt5_libdir}/libQt5*.so
@ -236,66 +240,8 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"


 %changelog
-* Sun Apr 05 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.43.alpha3
- rebuild (qt5)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.42.alpha3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.41.alpha3
- rebuild (qt5)
-
-* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.40.alpha3
- rebuild (qt5)
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.39.alpha3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 16 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.38.alpha3
- rebuild
-
-* Tue Jul 02 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.37.alpha3
- 5.212.0 alpha 3
-
-* Tue Jun 11 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.36.alpha2
- rebuild (qt5)
-
-* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.35.alpha2
- rebuild (qt5)
-
-* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.34.alpha2
- rebuild (qt5)
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.33.alpha2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.32.alpha2
- Rebuild for ICU 63
-
-* Tue Dec 11 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.31.alpha
- rebuild (qt5)
-
-* Sat Nov 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.30.alpha
- QtWebkit bundles malformed PNG files (#1639422)
-
-* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.29.alpha2
- rebuild (qt5)
-
-* Tue Aug 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.28.alpha2
- revert to real package names for core qt5 deps
-
-* Wed Jul 25 2018 Christian Dersch <lupinix@fedoraproject.org> - 5.212.0-0.27.alpha2
- Disable annobin for now, workaround for RHBZ #1608549
-
-* Tue Jul 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.26.alpha2
- backport some pkgconfig-related upstream fixes
- use %%ldconfig_scriptlets
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.25.alpha2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.24.alpha2
- Rebuild for ICU 62
+* Fri Jun 22 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 5.212.0-0.23.alpha2.0.riscv64
+- add support for RISC-V (riscv64)

 * Wed Jun 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.23.alpha2
 - rebuild (qt5)
--- a/qtwebkit-5.212.0-alpha2-add-riscv.patch
+++ b/qtwebkit-5.212.0-alpha2-add-riscv.patch
@ -0,0 +1,113 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1f9bab8..d5aa2ee 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -86,6 +86,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390")
+     set(WTF_CPU_S390 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
+     set(WTF_CPU_S390X 1)
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64")
+    set(WTF_CPU_RISCV64 1)
+ else ()
+     message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
+ endif ()
+diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
+index 1957446..96255d6 100644
+--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
+@@ -1289,6 +1289,7 @@ elseif (WTF_CPU_MIPS)
+ elseif (WTF_CPU_SH4)
+ elseif (WTF_CPU_X86)
+ elseif (WTF_CPU_X86_64)
+elseif (WTF_CPU_RISCV64)
+     if (MSVC AND ENABLE_JIT)
+         add_custom_command(
+             OUTPUT ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj
+diff --git a/Source/ThirdParty/brotli/dec/port.h b/Source/ThirdParty/brotli/dec/port.h
+index 19b457c..be1b2ad 100644
+--- a/Source/ThirdParty/brotli/dec/port.h
+++ b/Source/ThirdParty/brotli/dec/port.h
+@@ -66,6 +66,10 @@
+ #define BROTLI_TARGET_POWERPC64
+ #endif
+ 
+#if defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
+#define BROTLI_TARGET_RISCV64
+#endif
+
+ #if defined(__GNUC__) && defined(__GNUC_MINOR__)
+ #define BROTLI_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+ #else
+@@ -180,7 +184,7 @@ static inline void BrotliDump(const char* f, int l, const char* fn) {
+ #elif defined(BROTLI_BUILD_32_BIT)
+ #define BROTLI_64_BITS 0
+ #elif defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8) || \
+-    defined(BROTLI_TARGET_POWERPC64)
+    defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64)
+ #define BROTLI_64_BITS 1
+ #else
+ #define BROTLI_64_BITS 0
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 3f2069e..d4e02a8 100644
+--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
+@@ -176,6 +176,11 @@
+ #define WTF_CPU_X86_SSE2 1
+ #endif
+ 
+/* CPU(RISCV64) - RISCV64 */
+#if defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
+#define WTF_CPU_RISCV64 1
+#endif
+
+ /* CPU(ARM64) - Apple */
+ #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
+ #define WTF_CPU_ARM64 1
+@@ -712,7 +717,8 @@
+     || CPU(S390X) \
+     || CPU(MIPS64) \
+     || CPU(PPC64) \
+-    || CPU(PPC64LE)
+    || CPU(PPC64LE) \
+    || CPU(RISCV64)
+ #define USE_JSVALUE64 1
+ #else
+ #define USE_JSVALUE32_64 1
+diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h
+index 889642c..176d590 100644
+--- a/Source/WTF/wtf/dtoa/utils.h
+++ b/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(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(RISCV64)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
+diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
+index 84b18c7..b64d9d1 100755
+--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
+@@ -1264,6 +1264,11 @@ sub isARM()
+     return ($Config{archname} =~ /^arm[v\-]/) || ($Config{archname} =~ /^aarch64[v\-]/);
+ }
+ 
+sub isRISCV()
+{
+    return ($Config{archname} =~ /^riscv(|32|64)\-/);
+}
+
+ sub isX86_64()
+ {
+     return (architecture() eq "x86_64") || 0;
+@@ -2064,7 +2069,7 @@ sub generateBuildSystemFromCMakeProject
+     # Compiler options to keep floating point values consistent
+     # between 32-bit and 64-bit architectures.
+     determineArchitecture();
+-    if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
+    if ($architecture ne "x86_64" && !isARM() && !isRISCV && !isCrossCompilation() && !isAnyWindows()) {
+         $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
+     }
+ 
--- a/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch
+++ b/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch
@ -0,0 +1,15 @@
+diff -ur qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+--- qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp	2017-06-09 16:11:36.000000000 +0200
+++ qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp	2017-10-24 21:44:40.504943501 +0200
+@@ -390,7 +390,10 @@
+ 
+ QString QWebPageAdapter::selectedHtml() const
+ {
+-    return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML();
+    RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange();
+    if (!range)
+        return QString();
+    return range->toHTML();
+ }
+ 
+ bool QWebPageAdapter::isContentEditable() const
--- a/qtwebkit-5.212.0_fix_missing_sources.patch
+++ b/qtwebkit-5.212.0_fix_missing_sources.patch
@ -0,0 +1,20 @@
+Index: qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake
+===================================================================
+--- qtwebkit-5.212.0-alpha2.orig/Source/WebKit/PlatformQt.cmake
+++ qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake
+@@ -786,6 +786,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
+     set_source_files_properties(
+         qt/Api/qwebdatabase.cpp
+         qt/Api/qwebelement.cpp
+        qt/Api/qwebfullscreenrequest.cpp
+         qt/Api/qwebhistory.cpp
+         qt/Api/qwebhistoryinterface.cpp
+         qt/Api/qwebpluginfactory.cpp
+@@ -795,7 +796,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
+ 
+         qt/WidgetApi/qgraphicswebview.cpp
+         qt/WidgetApi/qwebframe.cpp
+-        qt/WidgetApi/qwebfullscreenrequest.cpp
+         qt/WidgetApi/qwebinspector.cpp
+         qt/WidgetApi/qwebpage.cpp
+         qt/WidgetApi/qwebview.cpp
--- a/qtwebkit-missing-semicolons.patch
+++ b/qtwebkit-missing-semicolons.patch
@ -1,28 +0,0 @@
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 1bca2d0..19355f1 100644
--- a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
-     unsigned i = 0;
- 
-     UChar32 c;
-    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
-        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
- 
-     for (unsigned i = 0; i < length;) {
-         UChar32 c;
-        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon) {
-                 ec = NAMESPACE_ERR;
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (qtwebkit-5.212.0-alpha3.tar.xz) = 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
+SHA512 (qtwebkit-5.212.0-alpha2.tar.xz) = b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758