repository

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

commit 8c0ca38ee346c863c1814587e89b65066c5e4a18
parent 52325c6dd46b5e14707ff7bcd038fa243d7041ef
Author: Cem Keylan <cem@ckyln.com>
Date:   Sat, 28 Mar 2020 01:56:25 +0300

webkit2gtk: bump to 2.28.0

Diffstat:
Mextra/webkit2gtk/build | 3++-
Mextra/webkit2gtk/checksums | 4++--
Mextra/webkit2gtk/depends | 5+++--
Mextra/webkit2gtk/patches/fix-musl.patch | 128+++++++++++++++++++++++++------------------------------------------------------
Mextra/webkit2gtk/sources | 2+-
Mextra/webkit2gtk/version | 2+-
Dtesting/webkit2gtk/build | 39---------------------------------------
Dtesting/webkit2gtk/checksums | 2--
Dtesting/webkit2gtk/depends | 15---------------
Dtesting/webkit2gtk/patches/fix-musl.patch | 117-------------------------------------------------------------------------------
Dtesting/webkit2gtk/sources | 2--
Dtesting/webkit2gtk/version | 1-
12 files changed, 49 insertions(+), 271 deletions(-)

diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build @@ -4,7 +4,7 @@ patch -p1 < fix-musl.patch # Remove gettext requirement. sed -i 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c -sed -i '/po_files *.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt +sed -i '/po_files \*\.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt sed -i '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt export DESTDIR="$1" @@ -16,6 +16,7 @@ cmake -B build \ -DPORT=GTK \ -DCMAKE_SKIP_RPATH=ON \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + -DENABLE_SAMPLING_PROFILER=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_GLES2=ON \ -DENABLE_INTL=OFF \ diff --git a/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums @@ -1,2 +1,2 @@ -4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f webkitgtk-2.26.4.tar.xz -b83f933a8e2309a8845010b8839043dd98a147a74609c6f16f51fea5728ad746 fix-musl.patch +361f3d178f62a9c112cbadfedd46106c34455c26d57a12a28fb3b09178d20e8b webkitgtk-2.28.0.tar.xz +67f7138b8d04e8bc02ce1bdbf728342abb55ef08566371105b3aefa0d3955a57 fix-musl.patch diff --git a/extra/webkit2gtk/depends b/extra/webkit2gtk/depends @@ -1,10 +1,11 @@ -gtk+3 -glib-networking cairo cmake make +glib-networking gperf make +gtk+3 harfbuzz-icu libXslt +libXt libgcrypt libsoup libwebp diff --git a/extra/webkit2gtk/patches/fix-musl.patch b/extra/webkit2gtk/patches/fix-musl.patch @@ -1,136 +1,88 @@ -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. - +diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h +index c5052527..dabd3733 100644 --- a/Source/JavaScriptCore/runtime/MachineContext.h +++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) +@@ -196,7 +196,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) +@@ -347,7 +347,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) +@@ -498,7 +498,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) +@@ -656,7 +656,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) +@@ -773,7 +773,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) ---- a/Source/JavaScriptCore/runtime/Options.h -+++ b/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.)") \ ---- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp -+++ b/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 ---- a/Source/WTF/wtf/Platform.h -+++ b/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 - +diff --git a/Source/WebCore/xml/XPathGrammar.cpp b/Source/WebCore/xml/XPathGrammar.cpp +index 0875a5ec..98d51533 100644 --- a/Source/WebCore/xml/XPathGrammar.cpp +++ b/Source/WebCore/xml/XPathGrammar.cpp -@@ -966,7 +966,7 @@ +@@ -966,7 +966,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. */ -@@ -989,7 +989,7 @@ +@@ -989,7 +989,7 @@ yystrlen (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 +diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h +index 41cab118..2ac66c7a 100644 +--- a/Source/JavaScriptCore/runtime/OptionsList.h ++++ b/Source/JavaScriptCore/runtime/OptionsList.h +@@ -90,9 +90,9 @@ constexpr bool enableWebAssemblyStreamingApi = false; + \ + v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ + \ +- v(Unsigned, maxPerThreadStackUsage, 5 * 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.)") \ diff --git a/extra/webkit2gtk/sources b/extra/webkit2gtk/sources @@ -1,2 +1,2 @@ -https://webkitgtk.org/releases/webkitgtk-2.26.4.tar.xz +https://webkitgtk.org/releases/webkitgtk-2.28.0.tar.xz patches/fix-musl.patch diff --git a/extra/webkit2gtk/version b/extra/webkit2gtk/version @@ -1 +1 @@ - 2.26.4 1 +2.28.0 1 diff --git a/testing/webkit2gtk/build b/testing/webkit2gtk/build @@ -1,39 +0,0 @@ -#!/bin/sh -e - -patch -p1 < fix-musl.patch - -# Remove gettext requirement. -sed -i 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c -sed -i '/po_files *.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt -sed -i '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt - -export DESTDIR="$1" - -cmake -B build \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib \ - -DPORT=GTK \ - -DCMAKE_SKIP_RPATH=ON \ - -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ - -DENABLE_GEOLOCATION=OFF \ - -DENABLE_GLES2=ON \ - -DENABLE_INTL=OFF \ - -DENABLE_INTROSPECTION=OFF \ - -DENABLE_MINIBROWSER=OFF \ - -DENABLE_OPENGL=OFF \ - -DENABLE_SPELLCHECK=OFF \ - -DENABLE_VIDEO=OFF \ - -DENABLE_WEBGL=OFF \ - -DENABLE_WEB_AUDIO=OFF \ - -DUSE_LIBHYPHEN=OFF \ - -DUSE_LIBNOTIFY=OFF \ - -DUSE_LIBSECRET=OFF \ - -DUSE_OPENJPEG=OFF \ - -DUSE_WOFF2=OFF \ - -DUSE_WPE_RENDERER=OFF \ - -DENABLE_WEB_CRYPTO=OFF \ - -Wno-dev - -cmake --build build -cmake --install build diff --git a/testing/webkit2gtk/checksums b/testing/webkit2gtk/checksums @@ -1,2 +0,0 @@ -361f3d178f62a9c112cbadfedd46106c34455c26d57a12a28fb3b09178d20e8b webkitgtk-2.28.0.tar.xz -2a0f0dd9745bba62e8ad9eea0117b1f2acccfde838f00c1aee7e5d3278130175 fix-musl.patch diff --git a/testing/webkit2gtk/depends b/testing/webkit2gtk/depends @@ -1,15 +0,0 @@ -gtk+3 -glib-networking -cairo -cmake make -gperf make -harfbuzz-icu -libXslt -libgcrypt -libsoup -libwebp -mesa -perl make -python make -ruby make -sqlite diff --git a/testing/webkit2gtk/patches/fix-musl.patch b/testing/webkit2gtk/patches/fix-musl.patch @@ -1,117 +0,0 @@ ---- a/Source/JavaScriptCore/runtime/MachineContext.h -+++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -196,7 +196,7 @@ - #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]); -@@ -347,7 +347,7 @@ - #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) -@@ -498,7 +498,7 @@ - #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) -@@ -656,7 +656,7 @@ - #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) -@@ -773,7 +773,7 @@ - #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) ---- a/Source/JavaScriptCore/runtime/OptionsList.h -+++ b/Source/JavaScriptCore/runtime/OptionsList.h -@@ -43,6 +43,16 @@ - 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 -+ - // How do JSC VM options work? - // =========================== - // The FOR_EACH_JSC_OPTION() macro below defines a list of all JSC options in use, ---- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.cpp -+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.cpp -@@ -728,7 +728,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. */ -@@ -743,7 +743,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 ---- a/Source/WTF/wtf/PlatformHave.h -+++ b/Source/WTF/wtf/PlatformHave.h -@@ -222,7 +222,7 @@ - #define HAVE_HOSTED_CORE_ANIMATION 1 - #endif - --#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 - ---- a/Source/WebCore/xml/XPathGrammar.cpp -+++ b/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/sources b/testing/webkit2gtk/sources @@ -1,2 +0,0 @@ -https://webkitgtk.org/releases/webkitgtk-2.28.0.tar.xz -patches/fix-musl.patch diff --git a/testing/webkit2gtk/version b/testing/webkit2gtk/version @@ -1 +0,0 @@ - 2.28.0 1