diff --git a/webkitgtk-2.30.2-x86-arm-jit-build-workaround.patch b/webkitgtk-2.30.2-x86-arm-jit-build-workaround.patch new file mode 100644 index 0000000..90c0bd1 --- /dev/null +++ b/webkitgtk-2.30.2-x86-arm-jit-build-workaround.patch @@ -0,0 +1,16 @@ +--- webkitgtk-2.30.2/Source/JavaScriptCore/runtime/ExecutableBase.h.orig 2020-11-15 13:38:05.728335800 +0100 ++++ webkitgtk-2.30.2/Source/JavaScriptCore/runtime/ExecutableBase.h 2020-11-15 13:39:39.097033310 +0100 +@@ -179,10 +179,11 @@ + + bool hasJITCodeFor(CodeSpecializationKind kind) const + { +- if (kind == CodeForCall) ++ return false; ++/* if (kind == CodeForCall) + return hasJITCodeForCall(); + ASSERT(kind == CodeForConstruct); +- return hasJITCodeForConstruct(); ++ return hasJITCodeForConstruct();*/ + } + + // Intrinsics are only for calls, currently. diff --git a/webkitgtk.spec b/webkitgtk.spec index 40518b1..65609c2 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -20,7 +20,7 @@ %define libname libwebkit2gtk Name: webkitgtk -Version: 2.28.4 +Version: 2.30.2 Release: 1mamba Summary: Port of WebKit embeddable web component to GTK+ Group: System/Libraries @@ -31,6 +31,7 @@ URL: http://www.webkitgtk.org/ Source0: http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch0: libwebkit-gtk-1.3.10-nspluginwrapper.patch Patch1: webkitgtk-2.16.6-arm-sync_add_and_fetch_8_duplicate.patch +Patch2: webkitgtk-2.30.2-x86-arm-jit-build-workaround.patch License: BSD, LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -142,17 +143,19 @@ This package contains the documentation for %{name}, %debug_package %prep -%setup -q -#-D -T +%setup -q -D -T +:<< _EOF +%ifarch arm %{ix86} +%patch2 -p1 +%endif %build -#:<< _EOF -%ifnarch x86_64 -# To workaround ar 4GB file limit see also: -# https://build.opensuse.org/package/view_file/openSUSE:Factory/webkit2gtk3/webkit2gtk3.spec -EXTRA_CFLAGS="-g0 -Wl,--no-keep-memory -fuse-ld=gold -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped" -EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -fuse-ld=gold -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped" -%endif +#%ifnarch x86_64 +## To workaround ar 4GB file limit see also: +## https://build.opensuse.org/package/view_file/openSUSE:Factory/webkit2gtk3/webkit2gtk3.spec +#EXTRA_CFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" +#EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" +#%endif %cmake -d build \ \ @@ -174,10 +177,11 @@ EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -fuse-ld=gold -Wl,--no-map-whole-files -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ %ifarch arm - -DENABLE_JIT=OFF \ -DENABLE_SPELLCHECK=0 %endif +# -DENABLE_JIT=OFF \ + %make %install @@ -236,6 +240,12 @@ EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -fuse-ld=gold -Wl,--no-map-whole-files %{_datadir}/gtk-doc/html/webkitdomgtk-%{apiver}/* %changelog +* Sat Nov 14 2020 Silvan Calarco 2.30.2-1mamba +- update to 2.30.2 + +* Sat Sep 26 2020 Automatic Build System 2.30.1-1mamba +- automatic version update by autodist + * Thu Jul 30 2020 Automatic Build System 2.28.4-1mamba - automatic version update by autodist