community/webkit2gtk: upgrade to 2.28.0

Also enable the WPE renderer and add a -dbg subpkg

3 files changed, 29 insertions, 75 deletions

diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD
index fb72761f572..f70cf0137fa 100644
--- a/community/webkit2gtk/APKBUILD
+++ b/community/webkit2gtk/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jiri Horner <laeqten@gmail.com>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=webkit2gtk
-pkgver=2.26.4
-pkgrel=3
+pkgver=2.28.0
+pkgrel=0
 pkgdesc="Portable web rendering engine WebKit for GTK+"
 url="https://webkitgtk.org/"
 arch="all"
@@ -47,14 +47,18 @@ makedepends="
 	samurai
 	sqlite-dev
 	woff2-dev
+	ruby-json
+	libwpe-dev
+	libwpebackend-fdo-dev
 	"
 replaces="webkit"
 options="!check" # upstream doesn't package them in release tarballs: Tools/Scripts/run-gtk-tests: Command not found
-subpackages="$pkgname-dev $pkgname-lang"
+subpackages="$pkgname-dev $pkgname-lang $pkgname-dbg"
 source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
 	fix-fast-memory-disabled.patch
 	musl-fixes.patch
 	fix-openjpeg.patch
+	lower-stack-usage.patch
 	"
 builddir="$srcdir/webkitgtk-$pkgver"
 
@@ -188,7 +192,7 @@ build() {
 		-DENABLE_GEOLOCATION=ON \
 		-DENABLE_SAMPLING_PROFILER=OFF \
 		-DENABLE_MINIBROWSER=ON \
-		-DUSE_WPE_RENDERER=OFF \
+		-DUSE_WPE_RENDERER=OŃ \
 		-DUSE_WOFF2=ON \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DUSE_LD_GOLD=OFF \
@@ -209,7 +213,8 @@ package() {
 	paxmark -m "$pkgdir"/usr/libexec/webkit2gtk-4.0/WebKitWebProcess
 }
 
-sha512sums="b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474  webkitgtk-2.26.4.tar.xz
+sha512sums="ce6b770e99741be6d353716d1e7bccba1372ed4667baeec41428d73c3502b0baa1cb8932f6bcede9c87d9b7f54b57a5a85a056c9882d4c5b34f9c70e6a2124dd  webkitgtk-2.28.0.tar.xz
 e1537b9937af1cb936669d405993a52204cb9968b8b3161cb12a3f3f1343c260088c9490fcd7a7deeab6dbabdb5f7ce7e6cb2f857b9f0a4205aba6db2b11fb20  fix-fast-memory-disabled.patch
-dfd5352272c02eeaae31af80eceb8158b84a92c15e4b3966912a2acdecf7e1aa1f6bf78992b88b344393b57724489e3452d57b7ab4ef7c9f2ef5acd10cb07b33  musl-fixes.patch
-c517c012f5630ef6be5be7d9592c5e042a070f849a141859edefa7984acb98dbd0d718fe6613cd35ba3b7d8530beebcc7408fd077cd914ed335c5e524e9e746a  fix-openjpeg.patch"
+4c0093e4a38c8ceb3ac92b94539ec1417241814a84abd157442f53f710ecbaf9c2345e258b8ad86d5e0908cacbfca6cad28dedd11c127756b65428f359ba9fcc  musl-fixes.patch
+c517c012f5630ef6be5be7d9592c5e042a070f849a141859edefa7984acb98dbd0d718fe6613cd35ba3b7d8530beebcc7408fd077cd914ed335c5e524e9e746a  fix-openjpeg.patch
+7d883fc35d0c6bfaa6bff8e9dbcaeaa9b7d7322852e874d8acc78d41a5aad5595650ec62444048e43aa349471cb16e5aed29e684207fc8d3421030e878ba1fa9  lower-stack-usage.patch"
diff --git a/community/webkit2gtk/lower-stack-usage.patch b/community/webkit2gtk/lower-stack-usage.patch
new file mode 100644
index 00000000000..71955f3e974
--- /dev/null
+++ b/community/webkit2gtk/lower-stack-usage.patch
@@ -0,0 +1,17 @@
+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/community/webkit2gtk/musl-fixes.patch b/community/webkit2gtk/musl-fixes.patch
index 8cd73b39443..e28d9a5a22b 100644
--- a/community/webkit2gtk/musl-fixes.patch
+++ b/community/webkit2gtk/musl-fixes.patch
@@ -45,54 +45,6 @@
  
  // 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
-@@ -138,9 +138,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, 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.)") \
-
---- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
-+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
-@@ -1975,7 +1975,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.  */
-@@ -1991,7 +1991,7 @@ 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
-@@ -710,7 +710,7 @@
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 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
@@ -114,23 +66,3 @@
  #   define yystpcpy stpcpy
  #  else
  /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
---- ./Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp.orig
-+++ ./Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.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