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

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

[-- Attachment #1: Type: text/plain, Size: 1393 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/41698

webkit2gtk: update to 2.39.4. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

This also adds `gst-plugins-good1` to depends to fix media playback.

Will be made into non-draft when 2.40 is released.

#### 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/41698.patch is attached

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

From 26610f784a89391992f41d8710c7ea8f8039ad70 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 1/6] webkit2gtk: update to 2.39.4.

libwebkit2gtk50 -> libwebkitgtk60
---
 common/shlibs                                 |  5 +-
 srcpkgs/{libwebkit2gtk50 => libwebkitgtk60}   |  0
 ...ebkit2gtk50-devel => libwebkitgtk60-devel} |  0
 srcpkgs/removed-packages/template             |  2 +
 .../patches/be-imagebufferbackend.patch       |  8 --
 .../webkit2gtk/patches/be-typedarray.patch    |  6 +-
 srcpkgs/webkit2gtk/patches/fix-angle.patch    | 27 ++++++
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 ------
 srcpkgs/webkit2gtk/patches/fix-headers.patch  | 89 +++++++++++++++++++
 srcpkgs/webkit2gtk/template                   | 39 ++++----
 10 files changed, 144 insertions(+), 59 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 create mode 100644 srcpkgs/webkit2gtk/patches/fix-angle.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/fix-headers.patch

diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..5bb87bc5b148 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1
 libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1
 libwebkit2gtk-4.1.so.0 libwebkit2gtk41-2.38.0_1
 libjavascriptcoregtk-4.1.so.0 libwebkit2gtk41-2.38.0_1
-libwebkit2gtk-5.0.so.0 libwebkit2gtk50-2.38.0_1
-libjavascriptcoregtk-5.0.so.0 libwebkit2gtk50-2.38.0_1
+libwebkitgtk-6.0.so.0 libwebkitgtk60-2.39.0_1
+libjavascriptcoregtk-6.0.so.0 libwebkitgtk60-2.39.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
@@ -1139,6 +1139,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
+libgsttranscoder-1.0.so.0 gst-plugins-bad1-1.18.4_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.20 gnome-desktop-43.0_1
 libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8febb5f0c1f4..91f771c410de 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -293,6 +293,8 @@ replaces="
  libunique1-devel<=1.1.6_12
  libunique1<=1.1.6_12
  libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
  libwnck2-devel<=2.30.7_8
  libwnck2<=2.30.7_8
  libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
          sourceRows += source.bytesPerRow;
          destinationRows += destination.bytesPerRow;
      }
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
-     // We don't currently support converting pixel data with non-8-bit buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
-     ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
- 
 diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
 index 1ca711b8..4a7168f8 100644
 --- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
 index df0435f6..3017563c 100644
 --- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
 +++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
-     RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
  
+     size_t searchLength = std::min<size_t>(length, updatedLength);
      if constexpr (ViewClass::Adaptor::isFloat) {
 -        if (std::isnan(static_cast<double>(*targetOption))) {
 +        double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
 +#endif
 +
 +        if (std::isnan(targetOptionLittleEndianAsDouble)) {
-             for (; index < length; ++index) {
+             for (; index < searchLength; ++index) {
 -                if (std::isnan(static_cast<double>(array[index])))
 +                double arrayElementLittleEndianAsDouble;
 +#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-angle.patch b/srcpkgs/webkit2gtk/patches/fix-angle.patch
new file mode 100644
index 000000000000..af8814bf8347
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/fix-angle.patch
@@ -0,0 +1,27 @@
+From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Mon, 16 Jan 2023 16:55:26 -0800
+Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in
+ ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689
+
+Unreviewed build fix.
+
+* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h:
+
+Canonical link: https://commits.webkit.org/258968@main
+---
+ Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
+index 94cb93e01fc0..ec7bda372f30 100644
+--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
++++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
+@@ -12,6 +12,7 @@
+ 
+ #include <algorithm>
+ #include <array>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
-     foreach (dep IN LISTS opt_DEPENDENCIES)
-         if (TARGET "gir-${dep}")
-             get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+            get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
-             if (dep_gir_path)
-                 list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
-                 list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
-                     "been previously configured with GI_INTROSPECT()"
-                 )
-             endif ()
-+            if (dep_gir_lib)
-+                list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+            endif ()
-         elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
-             list(APPEND scanner_flags
-                 "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
- 
-     # Record in targets to use later on e.g. with gi-docgen.
-     set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+    set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
-     set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/fix-headers.patch b/srcpkgs/webkit2gtk/patches/fix-headers.patch
new file mode 100644
index 000000000000..2739d683d548
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/fix-headers.patch
@@ -0,0 +1,89 @@
+From 9fe47e98a7f3b542413f3793912b291599f05860 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas.devoogdt@barco.com>
+Date: Tue, 17 Jan 2023 00:55:33 -0800
+Subject: [PATCH] REGRESSION(258347@main): Fix webkit.h public header
+
+https://bugs.webkit.org/show_bug.cgi?id=250701
+
+Reviewed by Carlos Garcia Campos.
+
+Since commit 654646fe6187abcf9ced6a3ace80eaf04754fd39, the webkit.h file is generated
+and does only define __WEBKIT_H_INSIDE__. So replace the only remaining __WEBKIT2_H_INSIDE__
+defines to avoid any "Only <webkit2/webkit2.h> can be included directly." error.
+
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
+
+Canonical link: https://commits.webkit.org/258974@main
+---
+ Source/WebKit/Scripts/glib/generate-api-header.py        | 4 ++--
+ Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Source/WebKit/Scripts/glib/generate-api-header.py b/Source/WebKit/Scripts/glib/generate-api-header.py
+index 6eb326b8764f..6977b51914e4 100644
+--- a/Source/WebKit/Scripts/glib/generate-api-header.py
++++ b/Source/WebKit/Scripts/glib/generate-api-header.py
+@@ -30,7 +30,7 @@
+     "gtk4": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+ #error \"Only <webkit/webkit.h> can be included directly.\"
+ #endif''',
+-    "gtk": '''#if !defined(__WEBKIT2_H_INSIDE__) && !defined(BUILDING_WEBKIT)
++    "gtk": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+ #error \"Only <webkit2/webkit2.h> can be included directly.\"
+ #endif''',
+     "wpe": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+@@ -54,7 +54,7 @@
+     "gtk4": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+ #error \"Only <webkit/webkit.h> can be included directly.\"
+ #endif''',
+-    "gtk": '''#if !defined(__WEBKIT2_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT)
++    "gtk": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+ #error \"Only <webkit2/webkit2.h> can be included directly.\"
+ #endif''',
+     "wpe": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in b/Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in
+index 52cda32496bb..493b8e9a1e5e 100644
+--- a/Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in
++++ b/Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in
+@@ -18,7 +18,7 @@
+  * Boston, MA 02110-1301, USA.
+  */
+ 
+-#if !defined(__WEBKIT2_H_INSIDE__) && !defined(BUILDING_WEBKIT)
++#if !defined(__WEBKIT_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+ #error "Only <webkit2/webkit2.h> can be included directly."
+ #endif
+ 
+From 8f11ad0813c37f4bd8ee43ecac733892a57e2a03 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas.devoogdt@barco.com>
+Date: Tue, 17 Jan 2023 05:45:34 -0800
+Subject: [PATCH] REGRESSION(258347@main): Fix webkit.h public header part 2
+
+https://bugs.webkit.org/show_bug.cgi?id=250701
+
+Reviewed by Carlos Garcia Campos.
+
+In commit 9fe47e98a7f3b542413f3793912b291599f05860, I've replaced all
+instances of __WEBKIT2_H_INSIDE__ with __WEBKIT_H_INSIDE__ but overlooked
+this one. So fix that.
+
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
+
+Canonical link: https://commits.webkit.org/258976@main
+---
+ Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in b/Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in
+index 0704d8016c45..f141a20aa65d 100644
+--- a/Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in
++++ b/Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in
+@@ -17,7 +17,7 @@
+  * Boston, MA 02110-1301, USA.
+  */
+ 
+-#if !defined(__WEBKIT@WEBKITGTK_API_INFIX@_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT)
++#if !defined(__WEBKIT_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+ #error "Only <webkit@WEBKITGTK_API_INFIX@/webkit@WEBKITGTK_API_INFIX@.h> can be included directly."
+ #endif
+ 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 32737a38154f..09039e2035cc 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.1
-revision=2
+version=2.39.4
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
@@ -19,24 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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')"
+depends="gst-plugins-good1"
 short_desc="GTK+3 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="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=02e195b3fb9e057743b3364ee7f1eec13f71614226849544c07c32a73b8f1848
-make_check=no
+checksum=44a56a68f43fc8684aaa55ddd0fb108503ab4ab0b24e31535e9d8b9dd57563ef
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -218,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
 	short_desc="GTK4 port of the WebKit2 browser engine"
 	pkg_install() {
-		vmove usr/libexec/webkit2gtk-5.0
-		vmove usr/lib/webkit2gtk-5.0
+		vmove usr/libexec/webkitgtk-6.0
+		vmove usr/lib/webkitgtk-6.0
 		if [ "$build_option_gir" ]; then
-			vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+			vmove "usr/lib/girepository-1.0/*-6.0.typelib"
 		fi
-		vmove "usr/lib/*-5.0.so.*"
-		for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+		vmove "usr/lib/*-6.0.so.*"
+		for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
 			vmove ${file/$DESTDIR/}
 		done
 		vlicense Source/WebCore/LICENSE-APPLE
@@ -237,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
 	short_desc="GTK4 port of the WebKit2 browser engine - development files"
 	pkg_install() {
-		vmove usr/include/webkitgtk-5.0
-		vmove "usr/lib/pkgconfig/*-5.0.pc"
+		vmove usr/include/webkitgtk-6.0
+		vmove "usr/lib/pkgconfig/*-6.0.pc"
 		if [ "$build_option_gir" ]; then
-			vmove "usr/share/gir-1.0/*-5.0.gir"
+			vmove "usr/share/gir-1.0/*-6.0.gir"
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove "usr/share/gtk-doc/html/*-5.0"
+			vmove "usr/share/gtk-doc/html/*-6.0"
 		fi
-		vmove "usr/lib/*-5.0.so"
+		vmove "usr/lib/*-6.0.so"
 	}
 }

From 014741e37c4ec378f542993cca67aba2d4250d71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:47:47 -0800
Subject: [PATCH 2/6] evolution-data-server: rebuild for webkit2gtk 2.39

---
 .../patches/webkitgtk60.patch                 | 71 +++++++++++++++++++
 srcpkgs/evolution-data-server/template        |  6 +-
 2 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/evolution-data-server/patches/webkitgtk60.patch

diff --git a/srcpkgs/evolution-data-server/patches/webkitgtk60.patch b/srcpkgs/evolution-data-server/patches/webkitgtk60.patch
new file mode 100644
index 000000000000..13dc9e46ebd4
--- /dev/null
+++ b/srcpkgs/evolution-data-server/patches/webkitgtk60.patch
@@ -0,0 +1,71 @@
+From 188bf38b86a517f1002dab02f019439215020058 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Mon, 14 Nov 2022 11:36:55 -0600
+Subject: [PATCH] Use webkitgtk-6.0 API version
+
+In WebKitGTK 2.39.1, the GTK 4 API version has been renamed from
+webkit2gtk-5.0 to webkitgtk-6.0. Hopefully it will stabilize in time for
+GNOME 44....
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a3ce7c1dd..c575acd3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -426,7 +426,7 @@ if(ENABLE_GTK4)
+ 
+ 	if(ENABLE_OAUTH2_WEBKITGTK4)
+ 		pkg_check_modules_for_option(ENABLE_OAUTH2_WEBKITGTK4 "WebKitGTK gtk4 for built-in OAuth2 authentications" OAUTH2_WEBKITGTK4
+-			webkit2gtk-5.0>=${webkit2gtk4_minimum_version}
++			webkitgtk-6.0>=${webkit2gtk4_minimum_version}
+ 		)
+ 	endif(ENABLE_OAUTH2_WEBKITGTK4)
+ endif(ENABLE_GTK4)
+-- 
+GitLab
+
+From 8d29b0bded2e4e3700ce08e9db2eaeac4400528a Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Mon, 21 Nov 2022 17:49:29 +0000
+Subject: [PATCH] M!108 - Try harder to support webkitgtk-6.0
+
+The cdb16f26f63f5093479a43cab32012845bcf33ed attempted to handle WebKitGTK
+API changes, but I forgot the header file name changed as well.
+
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/108
+---
+ src/libedataserverui/e-credentials-prompter-impl-oauth2.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
+index 2415947c3..b99ac4e60 100644
+--- a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
++++ b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
+@@ -32,21 +32,19 @@
+ #if GTK_CHECK_VERSION(4, 0, 0)
+ #ifdef ENABLE_OAUTH2_WEBKITGTK4
+ #define WITH_WEBKITGTK 1
++#include <webkit/webkit.h>
+ #else
+ #undef WITH_WEBKITGTK
+ #endif
+ #else
+ #ifdef ENABLE_OAUTH2_WEBKITGTK
+ #define WITH_WEBKITGTK 1
++#include <webkit2/webkit2.h>
+ #else
+ #undef WITH_WEBKITGTK
+ #endif
+ #endif
+ 
+-#ifdef WITH_WEBKITGTK
+-#include <webkit2/webkit2.h>
+-#endif /* WITH_WEBKITGTK */
+-
+ struct _ECredentialsPrompterImplOAuth2Private {
+ 	GMutex property_lock;
+ 
+-- 
+GitLab
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 33b71f4524ed..b31ec718fba9 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.46.2
+version=3.46.3
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -11,7 +11,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
 hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel
  $(vopt_if gir vala)"
 makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
- libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
  libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel"
 checkdepends="dbus"
 short_desc="Centralized access to appointments and contacts"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-data-server/${version%.*}/evolution-data-server-${version}.tar.xz"
-checksum=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
+checksum=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From 84abd2a204480437050cc51739a19cc81b88852e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:50:25 -0800
Subject: [PATCH 3/6] gnome-initial-setup: rebuild for webkit2gtk 2.39

---
 srcpkgs/gnome-initial-setup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..77a277cd112c 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
 version=43.2
-revision=1
+revision=3
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
  mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel

From e6450ee9bb62cc131eb066c818e126445a6fe4ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:54:16 -0800
Subject: [PATCH 4/6] gnome-builder: rebuild for webkit2gtk 2.39

---
 srcpkgs/gnome-builder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..660f86019410 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=43.4
-revision=1
+revision=2
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-intro
 makedepends="cairo-devel clang enchant2-devel flatpak-devel
  gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
  libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-devel
  libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
  python3-gobject-devel sysprof-devel libportal-gtk4-devel
  libsoup3-devel cmark-devel pango-devel libportal-devel

From 51cb438d3cc135b8fd1c24e10a667baf560cc157 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 12:53:26 -0800
Subject: [PATCH 5/6] New package: python3-emoji-2.2.0

---
 srcpkgs/python3-emoji/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-emoji/template

diff --git a/srcpkgs/python3-emoji/template b/srcpkgs/python3-emoji/template
new file mode 100644
index 000000000000..10da53c96f11
--- /dev/null
+++ b/srcpkgs/python3-emoji/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-emoji'
+pkgname=python3-emoji
+version=2.2.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+checkdepends="python3-pytest"
+short_desc="Emoji terminal output for Python"
+maintainer="Orphaned <orphaned@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/carpedm20/emoji"
+distfiles="https://github.com/carpedm20/emoji/archive/refs/tags/v${version}.tar.gz"
+checksum=b6af8e18de76fec176986be80698598937b38b760ca90954ca46454db99391c5
+
+do_check() {
+	python3 runtests.py
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 7c6e6a9f5f6414f9fccd308192368caa12038f9c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:56:11 -0800
Subject: [PATCH 6/6] Komikku: update to 1.8.0.

TODO: depends on libwebkit2gtk50
---
 srcpkgs/Komikku/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..0299b4848eba 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.1.0
-revision=2
+version=1.8.0
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
@@ -9,11 +9,11 @@ makedepends="gtk4-devel libadwaita-devel"
 depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=071d96193cc40464af76e1405799b9e90ecaa8e146dec8ce16b8f9371b7ba891