From 9f9a586707b7226e3da5b7a4f13aaaf3de18ac20 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 22 Nov 2018 19:46:52 +0100 Subject: [PATCH] an attempt at x32 patch no idea whether code should behave like CPU(X86) or like CPU(X86_64) but assumed the latter with additional condition on pointer size --- qt5-qtwebkit.spec | 2 ++ x32.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 x32.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 4cbbef9..837c8e1 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -50,6 +50,7 @@ Patch104: 0016-cmake-Import-ECMEnableSanitizers.patch Patch105: 0031-Disable-ES6-Proxy-object.patch Patch106: 0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch Patch107: 0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch +Patch108: x32.patch URL: https://github.com/annulen/webkit BuildRequires: OpenGL-devel BuildRequires: Qt5Core-devel >= %{qtbase_ver} @@ -198,6 +199,7 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH. %patch105 -p1 %patch106 -p1 %patch107 -p1 +%patch108 -p1 %build CXXFLAGS="%{rpmcxxflags} -fpermissive"; export CXXFLAGS diff --git a/x32.patch b/x32.patch new file mode 100644 index 0000000..f9911c3 --- /dev/null +++ b/x32.patch @@ -0,0 +1,15 @@ +--- webkit-qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/assembler/MacroAssembler.h.orig 2018-11-22 19:45:23.473588054 +0100 ++++ webkit-qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/assembler/MacroAssembler.h 2018-11-22 19:45:05.290379269 +0100 +@@ -1152,10 +1152,12 @@ + case 0xffff: + case 0xffffff: + case 0xffffffffL: ++#ifndef __ILP32__ + case 0xffffffffffL: + case 0xffffffffffffL: + case 0xffffffffffffffL: + case 0xffffffffffffffffL: ++#endif + return false; + default: { + if (value <= 0xff) -- 2.44.0