From a195973de8e9a357786e65af15d35a91a5d75c66 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Wed, 13 Mar 2019 20:25:56 +0100 Subject: [PATCH] webkit2gtk: update to 2.24.0. [ci skip] --- .../patches/fix-musl-javascriptcore.patch | 20 ++++++++++--------- srcpkgs/webkit2gtk/template | 13 ++++++------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch index 00066470183..c9b4de24493 100644 --- a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch +++ b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch @@ -59,7 +59,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for #define JSC_OPTIONS(v) \ v(bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \ v(unsigned, dumpOptions, 0, Normal, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \ -@@ -516,6 +517,395 @@ +@@ -516,6 +517,397 @@ v(bool, traceLLIntExecution, false, Configurable, nullptr) \ v(bool, traceLLIntSlowPath, false, Configurable, nullptr) \ @@ -71,11 +71,11 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for + v(optionString, configFile, nullptr, Normal, "file to configure JSC options and logging location") \ + \ + v(bool, useLLInt, true, Normal, "allows the LLINT to be used if true") \ -+ v(bool, useJIT, true, Normal, "allows the executable pages to be allocated for JIT and thunks if true") \ ++ v(bool, useJIT, jitEnabledByDefault(), Normal, "allows the executable pages to be allocated for JIT and thunks if true") \ + v(bool, useBaselineJIT, true, Normal, "allows the baseline JIT to be used if true") \ + v(bool, useDFGJIT, true, Normal, "allows the DFG JIT to be used if true") \ -+ v(bool, useRegExpJIT, true, Normal, "allows the RegExp JIT to be used if true") \ -+ v(bool, useDOMJIT, true, Normal, "allows the DOMJIT to be used if true") \ ++ v(bool, useRegExpJIT, jitEnabledByDefault(), Normal, "allows the RegExp JIT to be used if true") \ ++ v(bool, useDOMJIT, is64Bit(), Normal, "allows the DOMJIT to be used if true") \ + \ + v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ + \ @@ -114,6 +114,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for + v(bool, dumpFTLDisassembly, false, Normal, "dumps disassembly of FTL function upon compilation") \ + v(bool, dumpRegExpDisassembly, false, Normal, "dumps disassembly of RegExp upon compilation") \ + v(bool, dumpAllDFGNodes, false, Normal, nullptr) \ ++ v(bool, logJITCodeForPerf, false, Configurable, nullptr) \ + v(optionRange, bytecodeRangeToJITCompile, 0, Normal, "bytecode size range to allow compilation on, e.g. 1:100") \ + v(optionRange, bytecodeRangeToDFGCompile, 0, Normal, "bytecode size range to allow DFG compilation on, e.g. 1:100") \ + v(optionRange, bytecodeRangeToFTLCompile, 0, Normal, "bytecode size range to allow FTL compilation on, e.g. 1:100") \ @@ -415,14 +416,11 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for + \ + v(bool, enableSpectreMitigations, true, Restricted, "Enable Spectre mitigations.") \ + v(bool, enableSpectreGadgets, false, Restricted, "enable gadgets to test Spectre mitigations.") \ -+ v(bool, usePoisoning, true, Normal, "Poison is randomized at load time when true, and initialized to 0 if false which defeats some Spectre and type confusion mitigations, but allows tools such as leak detectors to function better.") \ + v(bool, zeroStackFrame, false, Normal, "Zero stack frame on entry to a function.") \ + \ -+ v(bool, useAsyncIterator, enableAsyncIteration, Normal, "Allow to use Async Iterator in JS.") \ -+ \ + v(bool, failToCompileWebAssemblyCode, false, Normal, "If true, no Wasm::Plan will sucessfully compile a function.") \ + v(size, webAssemblyPartialCompileLimit, 5000, Normal, "Limit on the number of bytes a Wasm::Plan::compile should attempt before checking for other work.") \ -+ v(unsigned, webAssemblyBBQOptimizationLevel, 1, Normal, "B3 Optimization level for BBQ Web Assembly module compilations.") \ ++ v(unsigned, webAssemblyBBQOptimizationLevel, 0, Normal, "B3 Optimization level for BBQ Web Assembly module compilations.") \ + v(unsigned, webAssemblyOMGOptimizationLevel, Options::defaultB3OptLevel(), Normal, "B3 Optimization level for OMG Web Assembly module compilations.") \ + \ + v(bool, useBBQTierUpChecks, true, Normal, "Enables tier up checks for our BBQ code.") \ @@ -437,10 +435,10 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for + v(bool, crashIfWebAssemblyCantFastMemory, false, Normal, "If true, we will crash if we can't obtain fast memory for wasm.") \ + v(unsigned, maxNumWebAssemblyFastMemories, 4, Normal, nullptr) \ + v(bool, useFastTLSForWasmContext, true, Normal, "If true, we will store context in fast TLS. If false, we will pin it to a register.") \ ++ v(bool, wasmBBQUsesAir, true, Normal, nullptr) \ + v(bool, useWebAssemblyStreamingApi, enableWebAssemblyStreamingApi, Normal, "Allow to run WebAssembly's Streaming API") \ + v(bool, useCallICsForWebAssemblyToJSCalls, true, Normal, "If true, we will use CallLinkInfo to inline cache Wasm to JS calls.") \ + v(bool, useEagerWebAssemblyModuleHashing, false, Normal, "Unnamed WebAssembly modules are identified in backtraces through their hash, if available.") \ -+ v(bool, useObjectRestSpread, true, Normal, "If true, we will enable Object Rest/Spread feature.") \ + v(bool, useBigInt, false, Normal, "If true, we will enable BigInt support.") \ + v(bool, useIntlNumberFormatToParts, enableIntlNumberFormatToParts, Normal, "If true, we will enable Intl.NumberFormat.prototype.formatToParts") \ + v(bool, useIntlPluralRules, enableIntlPluralRules, Normal, "If true, we will enable Intl.PluralRules.") \ @@ -450,6 +448,10 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for + v(bool, useTracePoints, false, Normal, nullptr) \ + v(bool, traceLLIntExecution, false, Configurable, nullptr) \ + v(bool, traceLLIntSlowPath, false, Configurable, nullptr) \ ++ v(bool, traceBaselineJITExecution, false, Normal, nullptr) \ ++ v(unsigned, thresholdForGlobalLexicalBindingEpoch, UINT_MAX, Normal, "Threshold for global lexical binding epoch. If the epoch reaches to this value, CodeBlock metadata for scope operations will be revised globally. It needs to be greater than 1.") \ ++ v(optionString, diskCachePath, nullptr, Restricted, nullptr) \ ++ v(bool, forceDiskCache, false, Restricted, nullptr) \ + +#endif /* !defined(__GLIBC__) */ diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index d973d6f026d..711b7128459 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,32 +1,33 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.22.7 +version=2.24.0 revision=1 wrksrc="webkitgtk-${version}" build_style=cmake build_helper="gir" configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc - -DUSE_GSTREAMER_GL=OFF -DRUBY_VERSION=2.6 + -DUSE_GSTREAMER_GL=OFF -DRUBY_VERSION=2.6 -DENABLE_C_LOOP=$(vopt_if jit OFF ON) -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.6.0 -DENABLE_INTROSPECTION=$(vopt_if gir ON OFF) -DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF) -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF) -DENABLE_JIT=$(vopt_if jit ON OFF) -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)" -hostmakedepends="perl python pkg-config intltool gperf flex ruby glib-devel geoclue2 +hostmakedepends="perl python pkg-config gperf flex ruby glib-devel geoclue2 $(vopt_if wayland wayland-devel)" -makedepends=" at-spi2-core-devel libjpeg-turbo-devel libpng-devel +makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel libsoup-devel libxslt-devel gnutls-devel icu-devel enchant-devel dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel - woff2-devel $(vopt_if x11 libXt-devel) $(vopt_if jit '' libatomic-devel) + woff2-devel freetype-devel libopenjpeg2-devel + $(vopt_if x11 libXt-devel) $(vopt_if jit '' libatomic-devel) $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')" short_desc="GTK+3 port of the WebKit2 browser engine" maintainer="Enno Boland " license="LGPL-2.1-or-later, BSD-2-Clause" homepage="https://webkitgtk.org/" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=4be6f7d605cd0a690fd26e8aa83b089a33ad9d419148eafcfb60580dd2af30ff +checksum=2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407 # ETOOHUGE nodebug=1