repository

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

commit c0ab44f72370ac44b998674aa51b168e3c1417fc
parent 65bf06519e580430d6b02ccba24641c65e184081
Author: Cem Keylan <cem@ckyln.com>
Date:   Sun, 15 Mar 2020 17:32:58 +0300

webkit2gtk: add update to testing

Diffstat:
Atesting/webkit2gtk/build | 39+++++++++++++++++++++++++++++++++++++++
Atesting/webkit2gtk/checksums | 2++
Atesting/webkit2gtk/depends | 15+++++++++++++++
Atesting/webkit2gtk/patches/fix-musl.patch | 100+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Atesting/webkit2gtk/sources | 2++
Atesting/webkit2gtk/version | 1+
6 files changed, 159 insertions(+), 0 deletions(-)

diff --git a/testing/webkit2gtk/build b/testing/webkit2gtk/build @@ -0,0 +1,39 @@ +#!/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 @@ -0,0 +1,2 @@ +361f3d178f62a9c112cbadfedd46106c34455c26d57a12a28fb3b09178d20e8b webkitgtk-2.28.0.tar.xz +2a0f0dd9745bba62e8ad9eea0117b1f2acccfde838f00c1aee7e5d3278130175 fix-musl.patch diff --git a/testing/webkit2gtk/depends b/testing/webkit2gtk/depends @@ -0,0 +1,15 @@ +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 @@ -0,0 +1,100 @@ +Author: Cem Keylan <cem@ckyln.com> +Subject: Fix Building WebKitGTK-2.28.0 on Musl Libc +Date: 2020-03-13 13:53 +--- webkitgtk-2.28.0/Source/JavaScriptCore/runtime/MachineContext.h ++++ webkitgtk-2.28.0-patch/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) +--- webkitgtk-2.28.0/Source/JavaScriptCore/runtime/OptionsList.h ++++ webkitgtk-2.28.0-patch/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, +--- webkitgtk-2.28.0/Source/WTF/wtf/PlatformHave.h ++++ webkitgtk-2.28.0-patch/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 + +--- webkitgtk-2.28.0/Source/WebCore/xml/XPathGrammar.cpp ++++ webkitgtk-2.28.0-patch/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 @@ -0,0 +1,2 @@ +https://webkitgtk.org/releases/webkitgtk-2.28.0.tar.xz +patches/fix-musl.patch diff --git a/testing/webkit2gtk/version b/testing/webkit2gtk/version @@ -0,0 +1 @@ + 2.28.0 1