From fc41645ae378cf440f9855785420af7254bf6060 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Mon, 18 May 2020 16:29:44 +0300 Subject: webkit2gtk: add new package at 2.29.1 --- testing/webkit2gtk/build | 50 ++++++++++++++++++ testing/webkit2gtk/checksums | 2 + testing/webkit2gtk/depends | 16 ++++++ testing/webkit2gtk/patches/fix-musl.patch | 88 +++++++++++++++++++++++++++++++ testing/webkit2gtk/sources | 2 + testing/webkit2gtk/version | 1 + 6 files changed, 159 insertions(+) create mode 100755 testing/webkit2gtk/build create mode 100644 testing/webkit2gtk/checksums create mode 100644 testing/webkit2gtk/depends create mode 100644 testing/webkit2gtk/patches/fix-musl.patch create mode 100644 testing/webkit2gtk/sources create mode 100644 testing/webkit2gtk/version diff --git a/testing/webkit2gtk/build b/testing/webkit2gtk/build new file mode 100755 index 00000000..ca07b196 --- /dev/null +++ b/testing/webkit2gtk/build @@ -0,0 +1,50 @@ +#!/bin/sh -e + +# Enable streaming related options if gstreamer +# is installed. +kiss l gst-plugins-base && streaming=ON + +# Enable the use of openjpeg if the package is +# installed. +kiss l openjpeg2 && jpeg=ON + +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_SAMPLING_PROFILER=OFF \ + -DENABLE_GEOLOCATION=OFF \ + -DENABLE_GLES2=ON \ + -DENABLE_INTL=OFF \ + -DENABLE_INTROSPECTION=OFF \ + -DENABLE_MINIBROWSER=OFF \ + -DENABLE_OPENGL=OFF \ + -DENABLE_SPELLCHECK=OFF \ + -DENABLE_VIDEO=${streaming:-OFF} \ + -DENABLE_WEBGL=OFF \ + -DENABLE_WEB_AUDIO=${streaming:-OFF} \ + -DUSE_LIBHYPHEN=OFF \ + -DUSE_LIBNOTIFY=OFF \ + -DUSE_LIBSECRET=OFF \ + -DUSE_OPENJPEG=${jpeg:-OFF} \ + -DUSE_WOFF2=OFF \ + -DUSE_WPE_RENDERER=OFF \ + -DENABLE_WEB_CRYPTO=OFF \ + -DUSE_SYSTEMD=OFF \ + -DENABLE_MEDIASOURCE=${streaming:-OFF} \ + -Wno-dev + +cmake --build build +cmake --install build diff --git a/testing/webkit2gtk/checksums b/testing/webkit2gtk/checksums new file mode 100644 index 00000000..04a258c8 --- /dev/null +++ b/testing/webkit2gtk/checksums @@ -0,0 +1,2 @@ +3f7bb1904f5050fb14fdc9cb2e471ac49c11f8ee6b99cc6f43b447216af0a866 webkitgtk-2.29.1.tar.xz +67f7138b8d04e8bc02ce1bdbf728342abb55ef08566371105b3aefa0d3955a57 fix-musl.patch diff --git a/testing/webkit2gtk/depends b/testing/webkit2gtk/depends new file mode 100644 index 00000000..6bbf47ec --- /dev/null +++ b/testing/webkit2gtk/depends @@ -0,0 +1,16 @@ +cairo +cmake make +glib-networking +gperf make +gtk+3 +harfbuzz-icu +libXslt +libXt +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 new file mode 100644 index 00000000..ee53a2f6 --- /dev/null +++ b/testing/webkit2gtk/patches/fix-musl.patch @@ -0,0 +1,88 @@ +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 +@@ -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((uintptr_t&) machineContext.gregs[REG_ESP]); +@@ -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) +@@ -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) +@@ -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) +@@ -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) +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 @@ 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 @@ 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/testing/webkit2gtk/sources b/testing/webkit2gtk/sources new file mode 100644 index 00000000..9d6e6921 --- /dev/null +++ b/testing/webkit2gtk/sources @@ -0,0 +1,2 @@ +https://webkitgtk.org/releases/webkitgtk-2.29.1.tar.xz +patches/fix-musl.patch diff --git a/testing/webkit2gtk/version b/testing/webkit2gtk/version new file mode 100644 index 00000000..8e565f46 --- /dev/null +++ b/testing/webkit2gtk/version @@ -0,0 +1 @@ +2.29.1 1 -- cgit v1.2.3