repository

Carbs Linux repositories
git clone git://git.carbslinux.org/repository
Log | Files | Refs | README | LICENSE

commit 06f713cd53c45d260f911270fa3b88c9dc7cc92c
parent c2d3a38300db0a5052e4f73c77266a0cc4a79111
Author: Cem Keylan <cem@ckyln.com>
Date:   Sat, 11 Jan 2020 12:44:20 +0300

webkit2gtk: add to testing

Diffstat:
Atesting/webkit2gtk/build | 36++++++++++++++++++++++++++++++++++++
Atesting/webkit2gtk/checksums | 3+++
Atesting/webkit2gtk/depends | 14++++++++++++++
Atesting/webkit2gtk/patches/fix-musl.patch | 136+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Atesting/webkit2gtk/patches/u16-fix.patch | 37+++++++++++++++++++++++++++++++++++++
Atesting/webkit2gtk/sources | 3+++
Atesting/webkit2gtk/version | 1+
7 files changed, 230 insertions(+), 0 deletions(-)

diff --git a/testing/webkit2gtk/build b/testing/webkit2gtk/build @@ -0,0 +1,36 @@ +#!/bin/sh -e + +patch -p1 < u16-fix.patch +patch -p0 < fix-musl.patch + +mkdir build +cd build + +cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_ACCESSIBILITY=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DPORT=GTK \ + -DLIB_INSTALL_DIR=/usr/lib \ + -DUSE_LIBHYPHEN=OFF \ + -DENABLE_MINIBROWSER=OFF \ + -DUSE_WOFF2=OFF \ + -DUSE_WPE_RENDERER=OFF \ + -DENABLE_INTROSPECTION=OFF \ + -DENABLE_INTL=OFF \ + -DUSE_LIBSECRET=OFF \ + -DUSE_OPENJPEG=OFF \ + -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + -DENABLE_GEOLOCATION=OFF \ + -DENABLE_SPELLCHECK=OFF \ + -DENABLE_GLES2=ON \ + -DENABLE_VIDEO=OFF \ + -DENABLE_OPENGL=OFF \ + -DENABLE_WEBGL=OFF \ + -DENABLE_WEB_AUDIO=OFF \ + -DUSE_LIBNOTIFY=OFF \ + -Wno-dev -G Ninja .. + +ninja +DESTDIR="$1" ninja install diff --git a/testing/webkit2gtk/checksums b/testing/webkit2gtk/checksums @@ -0,0 +1,3 @@ +6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 webkitgtk-2.26.2.tar.xz +c1abca4dbce87661b1fc378a84d3e9ed233b2b81872dcaf1bf7d2a0de0bc4c35 u16-fix.patch +7c0b0b8c63981b30d26893fd5aa0a226312b7d8b90b0a6e2100348c7d111a79e fix-musl.patch diff --git a/testing/webkit2gtk/depends b/testing/webkit2gtk/depends @@ -0,0 +1,14 @@ +libsoup +cairo +cmake +gettext +gtk+2 +gtk+3 +mesa +sqlite +libwebp +ruby +freetype-harfbuzz +libxslt +libtasn1 +mesa diff --git a/testing/webkit2gtk/patches/fix-musl.patch b/testing/webkit2gtk/patches/fix-musl.patch @@ -0,0 +1,136 @@ +Source: @q66, @pullmoll +Original upstream: Alpine Linux +Reason: fixing machine context access for musl libc; reduce stack/heap usage for jsc; fix some overly restrictive __GLIBC__ checks + +Updated for latest webkit2gtk. + +--- Source/JavaScriptCore/runtime/MachineContext.h ++++ Source/JavaScriptCore/runtime/MachineContext.h +@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || defined(__linux__) + + #if CPU(X86) + return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); +@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || 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 +@@ -112,6 +112,16 @@ constexpr bool enableWebAssemblyStreamingApi = true; + constexpr bool enableWebAssemblyStreamingApi = false; + #endif + ++#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 ++ + #define JSC_OPTIONS(v) \ + v(bool, useKernTCSM, true, Normal, "Note: this needs to go before other options since they depend on this value.") \ + v(bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \ +@@ -126,9 +136,9 @@ constexpr bool enableWebAssemblyStreamingApi = false; + \ + 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, jscMaxPerThreadStack, Normal, "Max allowed stack usage by the VM") \ ++ v(unsigned, softReservedZoneSize, jscSoftReservedZoneSize, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ ++ v(unsigned, reservedZoneSize, jscReservedZoneSize, 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 +@@ -728,7 +728,7 @@ int yydebug; + #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. */ +@@ -743,7 +743,7 @@ static YYSIZE_T yystrlen(const char *yystr) + # 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 +@@ -707,7 +707,7 @@ + + #endif /* OS(DARWIN) */ + +-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || OS(FUCHSIA) || ((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 +@@ -966,7 +966,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. */ +@@ -989,7 +989,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/testing/webkit2gtk/patches/u16-fix.patch b/testing/webkit2gtk/patches/u16-fix.patch @@ -0,0 +1,37 @@ +--- webkitgtk-2.26.2/Source/WTF/wtf/URLHelpers.cpp ++++ webkitgtk-2.26.2-patched/Source/WTF/wtf/URLHelpers.cpp +@@ -301,7 +301,7 @@ + Optional<UChar32> previousCodePoint; + while (i < length) { + UChar32 c; +- U16_NEXT(buffer, i, length, c) ++ U16_NEXT(buffer, i, length, c); + UErrorCode error = U_ZERO_ERROR; + UScriptCode script = uscript_getScript(c, &error); + if (error != U_ZERO_ERROR) { +--- webkitgtk-2.26.2/Source/WebCore/dom/Document.cpp ++++ webkitgtk-2.26.2-patched/Source/WebCore/dom/Document.cpp +@@ -4944,12 +4944,12 @@ + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -5009,7 +5009,7 @@ + + for (unsigned i = 0; i < length; ) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) + return Exception { InvalidCharacterError }; diff --git a/testing/webkit2gtk/sources b/testing/webkit2gtk/sources @@ -0,0 +1,3 @@ +https://webkitgtk.org/releases/webkitgtk-2.26.2.tar.xz +patches/u16-fix.patch +patches/fix-musl.patch diff --git a/testing/webkit2gtk/version b/testing/webkit2gtk/version @@ -0,0 +1 @@ +2.26.2 1