From 42e055d2bbae6792af727493131d0a2a185d9f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 14 Jul 2018 19:55:06 +0200 Subject: [PATCH] webkit2gtk: update to 2.20.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add patch to (hopefully) fix JS issues with musl libc. Signed-off-by: Jürgen Buchmüller --- .../patches/fix-glibc-js-and-alloc.patch | 137 ++++++++++++++++++ srcpkgs/webkit2gtk/template | 4 +- 2 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/webkit2gtk/patches/fix-glibc-js-and-alloc.patch diff --git a/srcpkgs/webkit2gtk/patches/fix-glibc-js-and-alloc.patch b/srcpkgs/webkit2gtk/patches/fix-glibc-js-and-alloc.patch new file mode 100644 index 00000000000..dfefcb6d46b --- /dev/null +++ b/srcpkgs/webkit2gtk/patches/fix-glibc-js-and-alloc.patch @@ -0,0 +1,137 @@ +--- Source/JavaScriptCore/runtime/MachineContext.h ++++ Source/JavaScriptCore/runtime/MachineContext.h +@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) || defined(__BIONIC__) ++#elif defined(__linux__) + + #if CPU(X86) + return reinterpret_cast((uintptr_t&) machineContext.gregs[REG_ESP]); +@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) || defined(__BIONIC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) || defined(__BIONIC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) || defined(__BIONIC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) || defined(__BIONIC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) + +--- Source/JavaScriptCore/runtime/Options.h ++++ Source/JavaScriptCore/runtime/Options.h +@@ -126,9 +126,9 @@ + \ + v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ + \ +- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \ +- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ +- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ ++ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \ ++ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ ++ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ + \ + v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ + v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ + +--- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp ++++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp +@@ -836,7 +836,7 @@ + #if YYERROR_VERBOSE + + # ifndef yystrlen +-# if defined __GLIBC__ && defined _STRING_H ++# if defined __linux__ && defined _STRING_H + # define yystrlen strlen + # else + /* Return the length of YYSTR. */ +@@ -852,7 +852,7 @@ + # endif + + # ifndef yystpcpy +-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE ++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE + # define yystpcpy stpcpy + # else + /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + +--- Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp ++++ Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp +@@ -1975,7 +1975,7 @@ + #if YYERROR_VERBOSE + + # ifndef yystrlen +-# if defined __GLIBC__ && defined _STRING_H ++# if defined __linux__ && defined _STRING_H + # define yystrlen strlen + # else + /* Return the length of YYSTR. */ +@@ -1991,7 +1991,7 @@ + # endif + + # ifndef yystpcpy +-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE ++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE + # define yystpcpy stpcpy + # else + /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + +--- Source/WTF/wtf/Platform.h ++++ Source/WTF/wtf/Platform.h +@@ -679,7 +679,7 @@ + #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 + #endif + +-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) + #define HAVE_MACHINE_CONTEXT 1 + #endif + +--- Source/WebCore/xml/XPathGrammar.cpp ++++ Source/WebCore/xml/XPathGrammar.cpp +@@ -967,7 +967,7 @@ + #if YYERROR_VERBOSE + + # ifndef yystrlen +-# if defined __GLIBC__ && defined _STRING_H ++# if defined __linux__ && defined _STRING_H + # define yystrlen strlen + # else + /* Return the length of YYSTR. */ +@@ -990,7 +990,7 @@ + # endif + + # ifndef yystpcpy +-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE ++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE + # define yystpcpy stpcpy + # else + /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 6d75e6b1aa8..6eb7a300313 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,6 +1,6 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.20.0 +version=2.20.3 revision=1 wrksrc="webkitgtk-$version" build_style=cmake @@ -13,7 +13,7 @@ maintainer="Enno Boland " homepage="https://webkitgtk.org/" license="LGPL-2.1, 2-clause-BSD" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c +checksum=579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8 # ETOOHUGE nodebug=1