webkit2gtk: update to 2.26.0

This reenables the bubblewrap sandbox as was in the 2.25.x update.

[ci skip]

srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch

@@ -1,14 +0,0 @@
---- Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp.orig	2017-09-14 10:03:40.908890971 +0200
-+++ Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp	2017-09-14 10:04:17.084859537 +0200
-@@ -112,7 +112,11 @@ void unregisterCode(void* start, void* e
- 
- bool fastMemoryEnabled()
- {
-+#if ENABLE(WEBASSEMBLY_FAST_MEMORY)
-     return fastHandlerInstalled;
-+#else
-+    return false;
-+#endif // ENABLE(WEBASSEMBLY_FAST_MEMORY)
- }
- 
- void enableFastMemory()

srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch

@@ -85,23 +85,23 @@ Updated for latest webkit2gtk.
      v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
 --- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
 +++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
-@@ -836,7 +836,7 @@
+@@ -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
+ #    ifndef yystrlen
+-#        if defined __GLIBC__ && defined _STRING_H
++#        if defined __linux__ && defined _STRING_H
+ #            define yystrlen strlen
+ #        else
  /* Return the length of YYSTR.  */
-@@ -852,7 +852,7 @@
- # endif
+@@ -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
+ #    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
 --- Source/WTF/wtf/Platform.h
 +++ Source/WTF/wtf/Platform.h

srcpkgs/webkit2gtk/template

@@ -1,7 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-reverts="2.25.4_1"
-version=2.24.4
+version=2.26.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -16,13 +15,14 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
  -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
  -DRUBY_VERSION=2.6
  -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.6.0
- -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF
+ -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=OFF
  -DENABLE_JIT=$(vopt_if jit ON OFF)
  -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
  -DENABLE_INTROSPECTION=$(vopt_if gir ON OFF)
  -DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
  -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
- -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)"
+ -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
 hostmakedepends="perl python pkg-config gperf flex ruby glib-devel geoclue2
  $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
@@ -38,15 +38,21 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8
+checksum=d210c0ecd1a89a22c9f8f1f450334f3489c5c50159b3a5e14dd93d5f349dcced
 
-build_options="gir wayland x11 jit sampling_profiler"
-build_options_default="gir wayland x11"
+build_options="gir wayland x11 bubblewrap jit sampling_profiler"
+build_options_default="gir wayland x11 bubblewrap"
 
+desc_option_bubblewrap="Enable bubblewrap sandbox"
 desc_option_jit="JavaScript JIT (Only some architectures)"
 desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)"
 
-CXXFLAGS="-Wno-expansion-to-defined -Wno-redundant-move -Wno-deprecated-copy"
+# detection + runtime
+if [ "$build_option_bubblewrap" ]; then
+	hostmakedepends+=" bubblewrap xdg-dbus-proxy"
+	makedepends+=" libseccomp-devel"
+	depends+=" bubblewrap xdg-dbus-proxy"
+fi
 
 # only a few platform support JIT
 case "$XBPS_TARGET_MACHINE" in