Re: [PR PATCH] [Updated] webkit2gtk: update to 2.38.0.

[oreo639 <oreo639@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1656 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/39488

webkit2gtk: update to 2.38.0.
[ci skip]

This splits webkit2gtk into 3 packages:
+ webkit2gtk40: GTK+3 and libsoup2
+ webkit2gtk41: GTK+3 and libsoup3
+ webkit2gtk50: GTK4 and libsoup3

This is necessary since libsoup2 and libsoup3 cannot be used at the same time.
Ideally the other packages would eventually be no longer necessary.

I tested this PR with epiphany 42 and it seems to work (and it compiles sucessfully).

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39488.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-39488.patch --]
[-- Type: text/x-diff, Size: 16538 bytes --]

From e2cdf59ed306848497e1e0281ca525b081d42b3c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Sep 2022 23:00:57 -0700
Subject: [PATCH] webkit2gtk: update to 2.38.0.

This splits webkit2gtk into 3 packages:
+ webkit2gtk40: GTK+3 and libsoup2
+ webkit2gtk41: GTK+3 and libsoup3
+ webkit2gtk50: GTK4 and libsoup3

This is necessary since libsoup2 and libsoup3 cannot be
used at the same time.
Ideally the other packages would eventually be no longer necessary.
---
 common/shlibs                                 |   8 +-
 .../webkit2gtk/patches/be-typedarray.patch    |  60 ++++----
 srcpkgs/webkit2gtk/patches/fix_armv6l.patch   |  12 +-
 srcpkgs/webkit2gtk/patches/reproducible.patch |   8 +-
 srcpkgs/webkit2gtk/template                   | 139 ++++++++++++++++--
 srcpkgs/webkit2gtk40                          |   1 +
 srcpkgs/webkit2gtk40-devel                    |   1 +
 srcpkgs/webkit2gtk41                          |   1 +
 srcpkgs/webkit2gtk41-devel                    |   1 +
 srcpkgs/webkit2gtk50                          |   1 +
 srcpkgs/webkit2gtk50-devel                    |   1 +
 11 files changed, 178 insertions(+), 55 deletions(-)
 create mode 120000 srcpkgs/webkit2gtk40
 create mode 120000 srcpkgs/webkit2gtk40-devel
 create mode 120000 srcpkgs/webkit2gtk41
 create mode 120000 srcpkgs/webkit2gtk41-devel
 create mode 120000 srcpkgs/webkit2gtk50
 create mode 120000 srcpkgs/webkit2gtk50-devel

diff --git a/common/shlibs b/common/shlibs
index c962f0ab7622..9e0f20adcfde 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -538,8 +538,12 @@ libsoup-3.0.so.0 libsoup3-3.0.0_1
 libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1
 libgnome-panel.so.0 gnome-panel-3.37.1_1
 libuninum.so.5 libuninum-2.7_1
-libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1
-libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1
+libwebkit2gtk-4.0.so.37 webkit2gtk40-2.38.0_1
+libjavascriptcoregtk-4.0.so.18 webkit2gtk40-2.38.0_1
+libwebkit2gtk-4.1.so.0 webkit2gtk41-2.38.0_1
+libjavascriptcoregtk-4.1.so.0 webkit2gtk41-2.38.0_1
+libwebkit2gtk-5.0.so.0 webkit2gtk50-2.38.0_1
+libjavascriptcoregtk-5.0.so.0 webkit2gtk50-2.38.0_1
 libgimp-2.0.so.0 libgimp-2.10.0_1
 libgimpwidgets-2.0.so.0 libgimp-2.10.0_1
 libgimpui-2.0.so.0 libgimp-2.10.0_1
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index f21c8fb57e45..fe93c2761305 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,42 +165,42 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
 index df0435f6..3017563c 100644
 --- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
 +++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -213,9 +213,36 @@ ALWAYS_INLINE EncodedJSValue genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
-     scope.assertNoExceptionExceptTermination();
+@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
      RELEASE_ASSERT(!thisObject->isDetached());
  
--    if (std::isnan(static_cast<double>(*targetOption))) {
-+    double targetOptionLittleEndianAsDouble;
+     if constexpr (ViewClass::Adaptor::isFloat) {
+-        if (std::isnan(static_cast<double>(*targetOption))) {
++        double targetOptionLittleEndianAsDouble;
 +#if CPU(BIG_ENDIAN)
-+    switch (ViewClass::TypedArrayStorageType) {
-+    case TypeFloat32:
-+    case TypeFloat64:
-+        targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+    default:
-+        // typed array views are commonly expected to be little endian views of the underlying data
-+        targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+    }
++        switch (ViewClass::TypedArrayStorageType) {
++        case TypeFloat32:
++        case TypeFloat64:
++            targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++        default:
++            // typed array views are commonly expected to be little endian views of the underlying data
++            targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
++        }
 +#else
-+    targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++        targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
 +#endif
 +
-+    if (std::isnan(targetOptionLittleEndianAsDouble)) {
-         for (; index < length; ++index) {
--            if (std::isnan(static_cast<double>(array[index])))
-+            double arrayElementLittleEndianAsDouble;
++        if (std::isnan(targetOptionLittleEndianAsDouble)) {
+             for (; index < length; ++index) {
+-                if (std::isnan(static_cast<double>(array[index])))
++                double arrayElementLittleEndianAsDouble;
 +#if CPU(BIG_ENDIAN)
-+            switch (ViewClass::TypedArrayStorageType) {
-+            case TypeFloat32:
-+            case TypeFloat64:
-+                arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+            default:
-+                // typed array views are commonly expected to be little endian views of the underlying data
-+                arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+            }
++                switch (ViewClass::TypedArrayStorageType) {
++                case TypeFloat32:
++                case TypeFloat64:
++                    arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++                default:
++                    // typed array views are commonly expected to be little endian views of the underlying data
++                    arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
++                }
 +#else
-+            arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++                arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
 +#endif
-+            if (std::isnan(arrayElementLittleEndianAsDouble))
-                 return JSValue::encode(jsBoolean(true));
-         }
-     } else {
++                if (std::isnan(arrayElementLittleEndianAsDouble))
+                     return JSValue::encode(jsBoolean(true));
+             }
+             return JSValue::encode(jsBoolean(false));
diff --git a/srcpkgs/webkit2gtk/patches/fix_armv6l.patch b/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
index 859aa9343694..fdaf19991924 100644
--- a/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
+++ b/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
@@ -4,9 +4,9 @@ and https://bugs.webkit.org/show_bug.cgi?id=141288
 
 --- a/Source/JavaScriptCore/offlineasm/arm.rb	2015-07-22 14:37:57.000000000 +0200
 +++ b/Source/JavaScriptCore/offlineasm/arm.rb	2015-08-08 00:31:21.011824644 +0200
-@@ -546,8 +546,16 @@
-                 $asm.puts "mov #{armFlippedOperands(operands)}"
-             end
+@@ -756,8 +756,16 @@ class Instruction
+             armMoveImmediate(operands[0].value >> 32, operands[1])
+             armMoveImmediate(operands[0].value & 0xffffffff, operands[2])
          when "mvlbl"
 +            if isARMv7 or isARMv7Traditional
                  $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
@@ -18,6 +18,6 @@ and https://bugs.webkit.org/show_bug.cgi?id=141288
 +                $asm.puts ".equ #{const_label}, (#{operands[0].value})"
 +                $asm.puts "ldr  #{operands[1].armOperand}, =#{const_label}"
 +            end
-         when "nop"
-             $asm.puts "nop"
-         when "bieq", "bpeq", "bbeq"
+         when "sxb2i"
+             $asm.puts "sxtb #{armFlippedOperands(operands)}"
+         when "sxh2i"
diff --git a/srcpkgs/webkit2gtk/patches/reproducible.patch b/srcpkgs/webkit2gtk/patches/reproducible.patch
index 4d0776c16840..2f3a555cbcfd 100644
--- a/srcpkgs/webkit2gtk/patches/reproducible.patch
+++ b/srcpkgs/webkit2gtk/patches/reproducible.patch
@@ -21,10 +21,10 @@ diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore
 index be5a5d51..becb2b2f 100644
 --- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
 +++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
-@@ -3163,7 +3163,7 @@ sub GenerateHeader
-     if (%structureFlags) {
-         push(@headerContent, "public:\n");
-         push(@headerContent, "    static constexpr unsigned StructureFlags = Base::StructureFlags");
+@@ -3217,7 +3217,7 @@ sub GenerateHeader
+         } else {
+             push(@headerContent, "    static constexpr unsigned StructureFlags = Base::StructureFlags");
+         }
 -        foreach my $structureFlag (sort (keys %structureFlags)) {
 +        foreach my $structureFlag (sort (sort keys %structureFlags)) {
              push(@headerContent, " | " . $structureFlag);
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 618dc43ed4ee..31e96ea59842 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.36.7
+version=2.38.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
  -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DCMAKE_SKIP_RPATH=ON
  -DENABLE_JOURNALD_LOG=OFF -DUSE_WOFF2=ON -DUSE_SOUP2=ON
- -DENABLE_GTKDOC=OFF -DUSE_WPE_RENDERER=ON
+ -DENABLE_GTKDOC=OFF -DUSE_WPE_RENDERER=ON -DENABLE_WEBDRIVER=OFF
  -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF)
  -DENABLE_JIT=$(vopt_if jit ON OFF)
  -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
@@ -20,23 +20,24 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
+ geoclue2 libharfbuzz which libpsl gi-docgen
  $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
- libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
- dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
+ libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
+ dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
  libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+depends="webkit2gtk40"
+short_desc="GTK port of the WebKit2 browser engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743
+checksum=f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd
 make_check=no
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser
@@ -62,7 +63,8 @@ export CCACHE_SLOPPINESS=time_macros,include_file_mtime
 if [ "$build_option_bubblewrap" ]; then
 	hostmakedepends+=" bubblewrap xdg-dbus-proxy"
 	makedepends+=" libseccomp-devel"
-	depends+=" bubblewrap xdg-dbus-proxy"
+	_all_depends="bubblewrap xdg-dbus-proxy"
+	depends+=" ${_all_depends}"
 fi
 
 if [ "$build_option_lto" -a -z "$build_option_clang" ]; then
@@ -132,21 +134,132 @@ pre_configure() {
 	esac
 }
 
+post_configure() {
+	mkdir -p webkit2gtk-41
+	pushd webkit2gtk-41
+		configure_args=${configure_args//-DUSE_SOUP2=ON/}
+		configure_args=${configure_args//-DENABLE_WEBDRIVER=OFF/}
+		do_configure
+	popd
+	mkdir -p webkit2gtk-50
+	pushd webkit2gtk-50
+		configure_args+=" -DUSE_GTK4=ON -DENABLE_WEBDRIVER=OFF"
+		do_configure
+	popd
+}
+
+pre_build() {
+	export NINJA_STATUS="[1/3][%f/%t] "
+}
+
+post_build() {
+	export NINJA_STATUS="[2/3][%f/%t] "
+	pushd webkit2gtk-41
+		do_build
+	popd
+	export NINJA_STATUS="[3/3][%f/%t] "
+	pushd webkit2gtk-50
+		do_build
+	popd
+}
+
 post_install() {
+	pushd webkit2gtk-41
+		do_install
+	popd
+	pushd webkit2gtk-50
+		do_install
+	popd
+
 	vlicense Source/WebCore/LICENSE-APPLE
 	vlicense Source/WebCore/LICENSE-LGPL-2.1
 	vlicense Source/WebCore/LICENSE-LGPL-2
 }
 
 webkit2gtk-devel_package() {
+	build_style=meta
+	depends="webkit2gtk40-devel ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files (transitional package)"
+}
+
+webkit2gtk40_package() {
+	depends="${_all_depends}"
+	short_desc="GTK+3 port of the WebKit2 browser engine (soup2)"
+	pkg_install() {
+		vmove usr/lib/webkit2gtk-4.0
+		vmove usr/libexec/webkit2gtk-4.0
+		if [ "$build_option_gir" ]; then
+			vmove "usr/lib/girepository-1.0/*-4.0.typelib"
+		fi
+		vmove "usr/lib/*-4.0.so.*"
+	}
+}
+
+webkit2gtk40-devel_package() {
 	depends="gtk+3-devel libsoup-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
+	short_desc="GTK+3 port of the WebKit2 browser engine (soup2) - development files"
+	pkg_install() {
+		vmove usr/include/webkitgtk-4.0
+		vmove "usr/lib/pkgconfig/*-4.0.pc"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-1.0/*-4.0.gir"
+			vmove "usr/share/gtk-doc/html/*-4.0"
+		fi
+		vmove "usr/lib/*-4.0.so"
+	}
+}
+
+webkit2gtk41_package() {
+	depends="${_all_depends}"
+	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	pkg_install() {
+		vmove usr/bin/WebKitWebDriver
+		vmove usr/libexec/webkit2gtk-4.1
+		vmove usr/lib/webkit2gtk-4.1
+		if [ "$build_option_gir" ]; then
+			vmove "usr/lib/girepository-1.0/*-4.1.typelib"
+		fi
+		vmove "usr/lib/*-4.1.so.*"
+	}
+}
+
+webkit2gtk41-devel_package() {
+	depends="gtk+3-devel libsoup3-devel ${sourcepkg}>=${version}_${revision}"
+	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	pkg_install() {
+		vmove usr/include/webkitgtk-4.1
+		vmove "usr/lib/pkgconfig/*-4.1.pc"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-1.0/*-4.1.gir"
+			vmove "usr/share/gtk-doc/html/*-4.1"
+		fi
+		vmove "usr/lib/*-4.1.so"
+	}
+}
+
+webkit2gtk50_package() {
+	depends="${_all_depends}"
+	short_desc="GTK4 port of the WebKit2 browser engine"
+	pkg_install() {
+		vmove usr/libexec/webkit2gtk-5.0
+		vmove usr/lib/webkit2gtk-5.0
+		if [ "$build_option_gir" ]; then
+			vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+		fi
+		vmove "usr/lib/*-5.0.so.*"
+	}
+}
+
+webkit2gtk50-devel_package() {
+	depends="gtk4-devel libsoup3-devel ${sourcepkg}>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit2 browser engine - development files"
 	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
+		vmove usr/include/webkitgtk-5.0
+		vmove "usr/lib/pkgconfig/*-5.0.pc"
 		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
+			vmove "usr/share/gir-1.0/*-5.0.gir"
+			vmove "usr/share/gtk-doc/html/*-5.0"
 		fi
-		vmove "usr/lib/*.so"
+		vmove "usr/lib/*-5.0.so"
 	}
 }
diff --git a/srcpkgs/webkit2gtk40 b/srcpkgs/webkit2gtk40
new file mode 120000
index 000000000000..8ae98428991b
--- /dev/null
+++ b/srcpkgs/webkit2gtk40
@@ -0,0 +1 @@
+webkit2gtk
\ No newline at end of file
diff --git a/srcpkgs/webkit2gtk40-devel b/srcpkgs/webkit2gtk40-devel
new file mode 120000
index 000000000000..8ae98428991b
--- /dev/null
+++ b/srcpkgs/webkit2gtk40-devel
@@ -0,0 +1 @@
+webkit2gtk
\ No newline at end of file
diff --git a/srcpkgs/webkit2gtk41 b/srcpkgs/webkit2gtk41
new file mode 120000
index 000000000000..8ae98428991b
--- /dev/null
+++ b/srcpkgs/webkit2gtk41
@@ -0,0 +1 @@
+webkit2gtk
\ No newline at end of file
diff --git a/srcpkgs/webkit2gtk41-devel b/srcpkgs/webkit2gtk41-devel
new file mode 120000
index 000000000000..8ae98428991b
--- /dev/null
+++ b/srcpkgs/webkit2gtk41-devel
@@ -0,0 +1 @@
+webkit2gtk
\ No newline at end of file
diff --git a/srcpkgs/webkit2gtk50 b/srcpkgs/webkit2gtk50
new file mode 120000
index 000000000000..8ae98428991b
--- /dev/null
+++ b/srcpkgs/webkit2gtk50
@@ -0,0 +1 @@
+webkit2gtk
\ No newline at end of file
diff --git a/srcpkgs/webkit2gtk50-devel b/srcpkgs/webkit2gtk50-devel
new file mode 120000
index 000000000000..8ae98428991b
--- /dev/null
+++ b/srcpkgs/webkit2gtk50-devel
@@ -0,0 +1 @@
+webkit2gtk
\ No newline at end of file