[PR PATCH] qt5-webkit: add musl stacksize patch from webkit2gtk

[PR PATCH] qt5-webkit: add musl stacksize patch from webkit2gtk

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt5-webkit
https://github.com/void-linux/void-packages/pull/23524

qt5-webkit: add musl stacksize patch from webkit2gtk
jsc on musl regulary fails without this patch:
> Fatal error compiling builtin function 'apply'

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/23524.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt5-webkit-23524.patch --]
[-- Type: text/x-diff, Size: 2575 bytes --]

From 86e90b673717d81e1b8334e3ce5ecf6f72b801c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 11 Jul 2020 19:28:32 +0200
Subject: [PATCH] qt5-webkit: add musl stacksize patch from webkit2gtk

jsc on musl regulary fails without this patch:
> Fatal error compiling builtin function 'apply'

[ci skip]
---
 srcpkgs/qt5-webkit/patches/jsc-musl.patch | 32 +++++++++++++++++++++++
 srcpkgs/qt5-webkit/template               |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qt5-webkit/patches/jsc-musl.patch

diff --git a/srcpkgs/qt5-webkit/patches/jsc-musl.patch b/srcpkgs/qt5-webkit/patches/jsc-musl.patch
new file mode 100644
index 00000000000..b8b77523196
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/jsc-musl.patch
@@ -0,0 +1,32 @@
+--- Source/JavaScriptCore/runtime/Options.h	2020-04-14 00:51:51.000000000 +0200
++++ -	2020-07-11 18:53:50.372744315 +0200
+@@ -40,6 +40,16 @@
+ 
+ namespace JSC {
+ 
++#if defined(__GLIBC__)
++constexpr unsigned jscMaxPerThreadStack = 4 * MB;
++constexpr unsigned jscSoftReservedZoneSize = 128 * KB;
++constexpr unsigned jscReservedZoneSize = 64 * KB;
++#else
++constexpr unsigned jscMaxPerThreadStack = 80 * KB;
++constexpr unsigned jscSoftReservedZoneSize = 32 * KB;
++constexpr unsigned jscReservedZoneSize = 16 * KB;
++#endif
++
+ // How do JSC VM options work?
+ // ===========================
+ // The JSC_OPTIONS() macro below defines a list of all JSC options in use,
+@@ -112,9 +122,9 @@
+     \
+     v(bool, reportMustSucceedExecutableAllocations, false, nullptr) \
+     \
+-    v(unsigned, maxPerThreadStackUsage, 4 * MB, nullptr) \
+-    v(unsigned, reservedZoneSize, 128 * KB, nullptr) \
+-    v(unsigned, errorModeReservedZoneSize, 64 * KB, nullptr) \
++    v(unsigned, maxPerThreadStackUsage, jscMaxPerThreadStack, nullptr) \
++    v(unsigned, reservedZoneSize, jscSoftReservedZoneSize, nullptr) \
++    v(unsigned, errorModeReservedZoneSize, jscReservedZoneSize, nullptr) \
+     \
+     v(bool, crashIfCantAllocateJITMemory, false, nullptr) \
+     v(unsigned, jitMemoryReservationSize, 0, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b86b746d252..03abdc4115d 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=10
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"

Re: [PR PATCH] [Merged]: qt5-webkit: add musl stacksize patch from webkit2gtk

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

There's a merged pull request on the void-packages repository

qt5-webkit: add musl stacksize patch from webkit2gtk
https://github.com/void-linux/void-packages/pull/23524

Description:
jsc on musl regulary fails without this patch:
> Fatal error compiling builtin function 'apply'

[ci skip]