webkit2gtk: update and move to extra

6 files changed, 195 insertions, 0 deletions

diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build
new file mode 100755
index 00000000..05ba8c84
--- /dev/null
+++ b/extra/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/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums
new file mode 100644
index 00000000..a2da6b91
--- /dev/null
+++ b/extra/webkit2gtk/checksums
@@ -0,0 +1,2 @@
+add51153943cc11d90a7038d0ea5f6332281e6c0be0640f802a211b035f0e611  webkitgtk-2.26.3.tar.xz
+b83f933a8e2309a8845010b8839043dd98a147a74609c6f16f51fea5728ad746  fix-musl.patch
diff --git a/extra/webkit2gtk/depends b/extra/webkit2gtk/depends
new file mode 100644
index 00000000..011c7680
--- /dev/null
+++ b/extra/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/extra/webkit2gtk/patches/fix-musl.patch b/extra/webkit2gtk/patches/fix-musl.patch
new file mode 100644
index 00000000..a9479a69
--- /dev/null
+++ b/extra/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.
+
+--- a/Source/JavaScriptCore/runtime/MachineContext.h
++++ b/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)
+--- 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
+
+--- 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/extra/webkit2gtk/sources b/extra/webkit2gtk/sources
new file mode 100644
index 00000000..a8bb27d6
--- /dev/null
+++ b/extra/webkit2gtk/sources
@@ -0,0 +1,2 @@
+https://webkitgtk.org/releases/webkitgtk-2.26.3.tar.xz
+patches/fix-musl.patch
diff --git a/extra/webkit2gtk/version b/extra/webkit2gtk/version
new file mode 100644
index 00000000..17f58ccf
--- /dev/null
+++ b/extra/webkit2gtk/version
@@ -0,0 +1 @@
+ 2.26.3 1