Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] webkit2gtk: update to 2.39.4. 
@ 2023-01-17 19:59 oreo639
  2023-01-17 20:03 ` [PR PATCH] [Updated] " oreo639
                   ` (42 more replies)
  0 siblings, 43 replies; 44+ messages in thread
From: oreo639 @ 2023-01-17 19:59 UTC (permalink / raw)
  To: ml

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

There is a new 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]

#### 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: 25406 bytes --]

From bd34e0e4ac92bc23e0c7b01c54750b8382cb1661 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 1/5] 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..816cb3670e17 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 gst-plugins-bad1"
 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 61978203f9e86bc667e86aaf836a1aa0e06d4132 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:47:47 -0800
Subject: [PATCH 2/5] 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 49cba2a05f7fc7451bbf74d853b808f80956593c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:50:25 -0800
Subject: [PATCH 3/5] 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 9919495caa989707ce82f53876d5f770be482159 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:54:16 -0800
Subject: [PATCH 4/5] 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 e0898d79fa4c8b558704813449bd0fc4846df226 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:56:11 -0800
Subject: [PATCH 5/5] Komikku: update to 1.8.0.

---
 srcpkgs/Komikku/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..91d8072f71c8 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"
 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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.39.4. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
@ 2023-01-17 20:03 ` oreo639
  2023-01-17 20:23 ` oreo639
                   ` (41 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-01-17 20:03 UTC (permalink / raw)
  To: ml

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

#### 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: 25389 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/5] 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/5] 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/5] 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/5] 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 6b52af1d528cbb2eb0c820a559138c0bd33ff8cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:56:11 -0800
Subject: [PATCH 5/5] Komikku: update to 1.8.0.

---
 srcpkgs/Komikku/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..91d8072f71c8 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"
 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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.39.4. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
  2023-01-17 20:03 ` [PR PATCH] [Updated] " oreo639
@ 2023-01-17 20:23 ` oreo639
  2023-01-17 20:26 ` oreo639
                   ` (40 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-01-17 20:23 UTC (permalink / raw)
  To: ml

[-- 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: 24584 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/5] 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/5] 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/5] 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/5] 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 bf62c6c28f9c85a35af2c746240bd916ee3b633f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:56:11 -0800
Subject: [PATCH 5/5] Komikku: update to 1.8.0.

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..7645140ddef8 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"

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.39.4. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
  2023-01-17 20:03 ` [PR PATCH] [Updated] " oreo639
  2023-01-17 20:23 ` oreo639
@ 2023-01-17 20:26 ` oreo639
  2023-01-17 20:53 ` oreo639
                   ` (39 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-01-17 20:26 UTC (permalink / raw)
  To: ml

[-- 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: 24972 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/5] 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/5] 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/5] 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/5] 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 3ace37e6fdf206563d31a0818de5e105864c7dac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 11:56:11 -0800
Subject: [PATCH 5/5] Komikku: update to 1.8.0.

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..32cb92a258b3 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"
@@ -16,4 +16,4 @@ 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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.39.4. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (2 preceding siblings ...)
  2023-01-17 20:26 ` oreo639
@ 2023-01-17 20:53 ` oreo639
  2023-01-17 20:55 ` oreo639
                   ` (38 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-01-17 20:53 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.39.4. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (3 preceding siblings ...)
  2023-01-17 20:53 ` oreo639
@ 2023-01-17 20:55 ` oreo639
  2023-03-22  0:49 ` oreo639
                   ` (37 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-01-17 20:55 UTC (permalink / raw)
  To: ml

[-- 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: 26556 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 bc1edd36e2f3672270d0669940497939c3b1a955 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 | 17 +++++++++++++++++
 1 file changed, 17 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..09a8a1b34edd
--- /dev/null
+++ b/srcpkgs/python3-emoji/template
@@ -0,0 +1,17 @@
+# 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
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 92484aa1bd74ccfb82219a4eda64914aa8d114e2 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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.39.4. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (4 preceding siblings ...)
  2023-01-17 20:55 ` oreo639
@ 2023-03-22  0:49 ` oreo639
  2023-03-22 10:19 ` [PR PATCH] [Updated] webkit2gtk: update to 2.40.0 oreo639
                   ` (36 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-22  0:49 UTC (permalink / raw)
  To: ml

[-- 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: 11662 bytes --]

From 18113cdc0ec45cb402433ca748d8f14d045c8769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH] webkit2gtk: update to 2.40.0.

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 8 files changed, 31 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 9b12ff7dbe51..7742c1643e14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -547,8 +547,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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1140,6 +1140,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 f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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-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/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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"
 	}
 }

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (5 preceding siblings ...)
  2023-03-22  0:49 ` oreo639
@ 2023-03-22 10:19 ` oreo639
  2023-03-22 10:33 ` oreo639
                   ` (35 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-22 10:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 53669 bytes --]

From 18113cdc0ec45cb402433ca748d8f14d045c8769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/16] webkit2gtk: update to 2.40.0.

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 8 files changed, 31 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 9b12ff7dbe51..7742c1643e14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -547,8 +547,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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1140,6 +1140,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 f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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-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/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 8bc3031839fd94faf0676b979038bd8605f7e4e8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/16] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From f2fc335a03ab91b3e797985856da8634ac1acc18 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/16] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7742c1643e14..9e440b9bd467 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From ef52903abdb35d8f9ef512d7eade6ad09d47a659 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/16] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From 8981052c305ac034c4705b4785fe7591e14a60c6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/16] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From b2c99b33f82355db00d7b53e7a1efdd24cd9abab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:04:23 -0700
Subject: [PATCH 06/16] New package: libdex-0.2.0

---
 common/shlibs           |  1 +
 srcpkgs/libdex-devel    |  1 +
 srcpkgs/libdex/template | 44 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 120000 srcpkgs/libdex-devel
 create mode 100644 srcpkgs/libdex/template

diff --git a/common/shlibs b/common/shlibs
index 9e440b9bd467..0e212ffd3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -430,6 +430,7 @@ libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
 libdvbpsi.so.10 libdvbpsi-1.3.1_1
 libdca.so.0 libdca-0.0.5_1
+libdex-1.so.1 libdex-0.2.0_1
 libmpeg2.so.0 libmpeg2-0.5.1_1
 libmpeg2convert.so.0 libmpeg2-0.5.1_1
 libmng.so.2 libmng-2.0.2_1
diff --git a/srcpkgs/libdex-devel b/srcpkgs/libdex-devel
new file mode 120000
index 000000000000..7f6d81db220a
--- /dev/null
+++ b/srcpkgs/libdex-devel
@@ -0,0 +1 @@
+libdex
\ No newline at end of file
diff --git a/srcpkgs/libdex/template b/srcpkgs/libdex/template
new file mode 100644
index 000000000000..783120b37e4d
--- /dev/null
+++ b/srcpkgs/libdex/template
@@ -0,0 +1,44 @@
+# Template file for 'libdex'
+pkgname=libdex
+version=0.2.0
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="-Dexamples=false
+ -Ddocs=$(vopt_if gtk_doc true false)
+ -Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_bool vala vapi)"
+hostmakedepends="pkg-config glib-devel gettext
+ $(vopt_if vala vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel libgirepository-devel libatomic-devel
+ liburing-devel $(vopt_if vala 'vala vala-devel')"
+short_desc="Future-based programming for GLib-based applications"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libdex"
+changelog="https://gitlab.gnome.org/GNOME/libdex/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/libdex/${version%.*}/libdex-${version}.tar.xz"
+checksum=a0f7566260971a1e4aeb53a07d95c806091257b8789d6fad9931dba872c5070d
+
+# Package build options
+build_options="gir vala gtk_doc"
+build_options_default="gir vala gtk_doc"
+
+libdex-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc
+		fi
+	}
+}

From 7a7281bf2a03396c2bdcde6ce70d110f6fb1ad29 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sat, 18 Mar 2023 00:33:12 +0100
Subject: [PATCH 07/16] gtk4: update to 4.10.1.

---
 srcpkgs/gtk4/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 7e08d3dd0ec0..6a50567f53a9 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.8.3
+version=4.10.1
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dgtk_doc=true
+ -Dbuild-tests=false -Dbuild-testsuite=false
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
@@ -30,9 +31,9 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 #changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-8/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-10/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=b362f968d085b4d3d9340d4d38c706377ded9d5374e694a2b6b7e6292e3cba74
+checksum=e8fcac04bc7715b9da667c911a5ee8f262e200d1d6a50adf23645ca8cfcd0311
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"

From 0a8f752b0dd94f9a762c216a7d0b1d818a0fe3be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:15:19 -0700
Subject: [PATCH 08/16] libadwaita: update to 1.3.1.

---
 srcpkgs/libadwaita/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index be7b11ce1478..69300f080e44 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.2.2
+version=1.3.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GTK4 building blocks for modern adaptive applications"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-2/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-3/NEWS"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=6958df0511e33867970d1077e3330a6f8c232da8d43434b6d60133a6982b8596
+checksum=6b8bbf413c501b46c8616a0e5b836d7a34091140941412520bbd9ddda6df8cbd
 make_check_pre="xvfb-run"
 
 build_options="gir gtk_doc"

From ca2dda9b73b54d2508845b5c3eaea628a6efca65 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 09/16] glib: update to 2.76.0.

---
 ...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  23 ++-
 .../fix-segfault-g_param_value_is_valid.patch |  35 -----
 srcpkgs/glib/patches/fix-test-cxxcpp.patch    |  26 ++++
 .../glib/patches/gnome-console-support.patch  |  62 --------
 srcpkgs/glib/patches/test-error-musl.patch    |  50 -------
 srcpkgs/glib/template                         |  15 +-
 7 files changed, 186 insertions(+), 163 deletions(-)
 create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
 delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
 create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
 delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
 delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch

diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function.  But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h   | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean             (g_str_has_prefix) (const gchar *str,
+     (g_str_has_suffix) (STR, SUFFIX)                                          \
+   )
+ 
+-#define g_strdup(STR)                                                         \
+-  (__builtin_constant_p ((STR)) ?                                             \
+-    (G_LIKELY ((STR) != NULL) ?                                               \
+-      G_GNUC_EXTENSION ({                                                     \
+-        const char *const ___str = ((STR));                                   \
+-        const char *const __str = _G_STR_NONNULL (___str);                    \
+-        const size_t __str_len = strlen (__str) + 1;                          \
+-        char *__dup_str = (char *) g_malloc (__str_len);                      \
+-        (char *) memcpy (__dup_str, __str, __str_len);                        \
+-      })                                                                      \
+-      :                                                                       \
+-      (char *) (NULL)                                                         \
+-    )                                                                         \
+-    :                                                                         \
+-    (g_strdup) ((STR))                                                        \
+-  )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar*                g_strjoin	       (const gchar  *separator,
+ 					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+ 
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++  if (__builtin_constant_p (!str) && !str)
++    return NULL;
++
++  if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++    {
++      const size_t len = strlen (str) + 1;
++      char *dup_str = (char *) g_malloc (len);
++      return (char *) memcpy (dup_str, str, len);
++    }
++
++  return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+  * sequences. Inverse of g_strescape. The recognized sequences are \b
+  * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+   g_free (str);
+ }
+ 
++static void
++test_strdup_macro_qualified (void)
++{
++  gchar *str;
++
++  g_assert_null (::g_strdup (NULL));
++
++  str = ::g_strdup ("C++ is cool too!");
++  g_assert_nonnull (str);
++  g_assert_cmpstr (str, ==, "C++ is cool too!");
++  g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++  struct
++  {
++    char *p, *q;
++  } strings = {
++    g_strdup (NULL),
++    g_strdup ("C++ is cool too!"),
++  };
++
++  g_assert_null (strings.p);
++  g_assert_nonnull (strings.q);
++  g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++  g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+   g_test_add_func ("/C++/str-equal", test_str_equal);
+   g_test_add_func ("/C++/strdup", test_strdup);
+   g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++  g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++  g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+   g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+   g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+   g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'converter-stream' : {},
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
  #  Test programs buildable on UNIX only
  if host_machine.system() != 'windows'
    gio_tests += {
@@ -16,7 +16,7 @@
      'gdbus-peer-object-manager' : {},
      'gdbus-sasl' : {},
      'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
        test_resources_binary2,
      ]
    endif
@@ -24,18 +24,17 @@
 -  gio_tests += {
 -    'resources' : {
 -      'extra_sources' : resources_extra_sources,
--      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--      'should_fail' : host_system == 'darwin',
+-      'depends' : resource_plugin,
 -    },
 -  }
  endif
  
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
 index d74617823..1de81a825 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--    'should_fail' : host_system == 'darwin',
+-    'can_fail' : host_system == 'darwin',
 -  },
    'dir' : {},
    'environment' : {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'error' : {},
 -  'fileutils' : {},
    'gdatetime' : {
      'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
+     'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
    'node' : {},
    'once' : {},
    'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec   *pspec,
- {
-   GParamSpec *param = value->data[0].v_pointer;
- 
-+  if (param == NULL)
-+    return FALSE;
-+
-   return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
- 
--- 
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int    *argc,
-   int i, j;
-   char **term_argv = NULL;
-   int term_argc = 0;
-+  gboolean pass_cmd_as_single_arg = FALSE;
-   char *check;
-   char **the_argv;
- 
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int    *argc,
-         }
-       else
-         {
-+          if (check == NULL) {
-+            check = g_find_program_in_path ("kgx");
-+            if (check != NULL)
-+              pass_cmd_as_single_arg = TRUE;
-+          }
-           if (check == NULL)
-             check = g_find_program_in_path ("tilix");
-           if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int    *argc,
-         }
-     }
- 
--  real_argc = term_argc + *argc;
-+  real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
-   real_argv = g_new (char *, real_argc + 1);
- 
-   for (i = 0; i < term_argc; i++)
-     real_argv[i] = term_argv[i];
- 
--  for (j = 0; j < *argc; j++, i++)
--    real_argv[i] = (char *)the_argv[j];
-+  if (pass_cmd_as_single_arg) {
-+    char **quoted_argv = g_new (char *, *argc + 1);
-+
-+    for (j = 0; j < *argc; j++) {
-+      quoted_argv[j] = g_shell_quote (the_argv[j]);
-+      g_free (the_argv[j]);
-+    }
-+    quoted_argv[j] = NULL;
-+
-+    real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+    g_strfreev (quoted_argv);
-+  } else {
-+    for (j = 0; j < *argc; j++, i++)
-+      real_argv[i] = (char *)the_argv[j];
-+  }
- 
-   real_argv[i] = NULL;
- 
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
-                          ...)
- {
--#ifdef __linux__
--  /* Only worth testing this on Linux; if other platforms regress on this legacy
--   * behaviour, we don’t care. In particular, calling g_error_new_valist() with
--   * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
--   * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
--   * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+  /* Only worth testing this on Linux with glibc; if other platforms regress on
-+   * this legacy behaviour, we don’t care. In particular, calling
-+   * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+   * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+   * fine: it’s a programmer error in either case. */
-   const struct
-     {
-       GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
- 
-       va_end (ap);
-     }
--#else  /* if !__linux__ */
--  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif  /* !__linux__ */
-+#else  /* if !__linux__ || !__GLIBC__ */
-+  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
- 
- static void
--- 
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
 make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
+post_patch() {
+	# Timer test is flaky on 32 bit (does float comparisons)
+	if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+		vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+	fi
+}
+
 pre_check() {
 	# machine-id is a random, non-zero value
 	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id

From 30a71cc3ee7bf2b1c7581856b19a06cbf9d0c6b1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 10/16] libpanel: update to 1.2.0.

---
 srcpkgs/libpanel/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
 # Template file for 'libpanel'
 pkgname=libpanel
-version=1.0.2
+version=1.2.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
 
 pre_build() {
 	# help gi-docgen find gi files on cross

From 1ef6ed22276bed204c081e928e967c2f8ef8f9aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:27:04 -0700
Subject: [PATCH 11/16] gtksourceview5: update to 5.8.0.

---
 srcpkgs/gtksourceview5/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 711194803bb0..0d24076811d7 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.6.2
+version=5.8.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="Text widget that extends GTK4 GtkTextView widget"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GtkSourceView"
-#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-6/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-8/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=1f146c156f135a60499d979e3577c99b6e15a111445767abe6219bb34c545c77
+checksum=110dd4c20def21886fbf777298fe0ef8cc2ad6023b8f36c7424411a414818933
 make_check_pre="xvfb-run"
 
 # Package build options

From 81a48eeeba9cdcd1493d7218e1de9de06b0e85ae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:33:38 -0700
Subject: [PATCH 12/16] jsonrpc-glib: update to 3.44.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 4ee57547f9dd..42d6762a8c64 100644
--- a/srcpkgs/jsonrpc-glib/template
+++ b/srcpkgs/jsonrpc-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'jsonrpc-glib'
 pkgname=jsonrpc-glib
-version=3.42.0
+version=3.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 changelog="https://gitlab.gnome.org/GNOME/jsonrpc-glib/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz"
-checksum=221989a57ca82a12467dc427822cd7651b0cad038140c931027bf1074208276b
+checksum=69406a0250d0cc5175408cae7eca80c0c6bfaefc4ae1830b354c0433bcd5ce06
 
 build_options="gir vala gtk_doc"
 build_options_default="gir vala gtk_doc"

From fca5884e0ebe40dbc1215af37a9316eb80ef1291 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:34:04 -0700
Subject: [PATCH 13/16] libpeas: update to 1.36.0.

---
 srcpkgs/libpeas/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index f7eba85d8336..8c85745f9c00 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
-version=1.34.0
-revision=2
+version=1.36.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Libpeas"
 changelog="https://gitlab.gnome.org/GNOME/libpeas/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libpeas/${version%.*}/libpeas-${version}.tar.xz"
-checksum=4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0
+checksum=297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c
 make_check_pre="xvfb-run"
 
 libpeas-devel_package() {

From 37422f6cd038ddd3cadd771a4be1b40d5677b3ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:34:34 -0700
Subject: [PATCH 14/16] template-glib: update to 3.36.1.

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

diff --git a/srcpkgs/template-glib/template b/srcpkgs/template-glib/template
index eaa26164b038..dd0e5c291710 100644
--- a/srcpkgs/template-glib/template
+++ b/srcpkgs/template-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'template-glib'
 pkgname=template-glib
-version=3.36.0
+version=3.36.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/template-glib"
 changelog="https://gitlab.gnome.org/GNOME/template-glib/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/template-glib/${version%.*}/template-glib-${version}.tar.xz"
-checksum=1c129525ae64403a662f7666f6358386a815668872acf11cb568ab39bba1f421
+checksum=3b167a17385ad745afbe20fadf8106c66d30c5bd746d5aa1d9bdb7e803f6a503
 
 template-glib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libgirepository-devel

From 59dc9f90b4e0f0f7f31a9c5f4d74349cf0bca3c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 15/16] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=43.4
+version=44.1
 revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From 0cff75f545adb5e345dcff6a280c8f886dd743aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 16/16] Komikku: downgrade to 0.41.0.

Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
 .../Komikku/patches/fix-appdata-file.patch    | 39 +++++++++++++++++++
 srcpkgs/Komikku/template                      | 13 ++++---
 2 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch

diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+ 
+     <screenshots>
+         <screenshot type="default">
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+         </screenshot>
+     </screenshots>
+ 
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..46c87d4df628 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="0.1.1_1 0.1.1_2"
+version=0.41.0
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 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"
 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=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (6 preceding siblings ...)
  2023-03-22 10:19 ` [PR PATCH] [Updated] webkit2gtk: update to 2.40.0 oreo639
@ 2023-03-22 10:33 ` oreo639
  2023-03-22 17:11 ` paper42
                   ` (34 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-22 10:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 53669 bytes --]

From 18113cdc0ec45cb402433ca748d8f14d045c8769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/16] webkit2gtk: update to 2.40.0.

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 8 files changed, 31 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 9b12ff7dbe51..7742c1643e14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -547,8 +547,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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1140,6 +1140,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 f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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-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/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 8bc3031839fd94faf0676b979038bd8605f7e4e8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/16] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From f2fc335a03ab91b3e797985856da8634ac1acc18 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/16] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7742c1643e14..9e440b9bd467 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From ef52903abdb35d8f9ef512d7eade6ad09d47a659 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/16] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From 8981052c305ac034c4705b4785fe7591e14a60c6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/16] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From b2c99b33f82355db00d7b53e7a1efdd24cd9abab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:04:23 -0700
Subject: [PATCH 06/16] New package: libdex-0.2.0

---
 common/shlibs           |  1 +
 srcpkgs/libdex-devel    |  1 +
 srcpkgs/libdex/template | 44 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 120000 srcpkgs/libdex-devel
 create mode 100644 srcpkgs/libdex/template

diff --git a/common/shlibs b/common/shlibs
index 9e440b9bd467..0e212ffd3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -430,6 +430,7 @@ libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
 libdvbpsi.so.10 libdvbpsi-1.3.1_1
 libdca.so.0 libdca-0.0.5_1
+libdex-1.so.1 libdex-0.2.0_1
 libmpeg2.so.0 libmpeg2-0.5.1_1
 libmpeg2convert.so.0 libmpeg2-0.5.1_1
 libmng.so.2 libmng-2.0.2_1
diff --git a/srcpkgs/libdex-devel b/srcpkgs/libdex-devel
new file mode 120000
index 000000000000..7f6d81db220a
--- /dev/null
+++ b/srcpkgs/libdex-devel
@@ -0,0 +1 @@
+libdex
\ No newline at end of file
diff --git a/srcpkgs/libdex/template b/srcpkgs/libdex/template
new file mode 100644
index 000000000000..783120b37e4d
--- /dev/null
+++ b/srcpkgs/libdex/template
@@ -0,0 +1,44 @@
+# Template file for 'libdex'
+pkgname=libdex
+version=0.2.0
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="-Dexamples=false
+ -Ddocs=$(vopt_if gtk_doc true false)
+ -Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_bool vala vapi)"
+hostmakedepends="pkg-config glib-devel gettext
+ $(vopt_if vala vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel libgirepository-devel libatomic-devel
+ liburing-devel $(vopt_if vala 'vala vala-devel')"
+short_desc="Future-based programming for GLib-based applications"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libdex"
+changelog="https://gitlab.gnome.org/GNOME/libdex/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/libdex/${version%.*}/libdex-${version}.tar.xz"
+checksum=a0f7566260971a1e4aeb53a07d95c806091257b8789d6fad9931dba872c5070d
+
+# Package build options
+build_options="gir vala gtk_doc"
+build_options_default="gir vala gtk_doc"
+
+libdex-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc
+		fi
+	}
+}

From 7a7281bf2a03396c2bdcde6ce70d110f6fb1ad29 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sat, 18 Mar 2023 00:33:12 +0100
Subject: [PATCH 07/16] gtk4: update to 4.10.1.

---
 srcpkgs/gtk4/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 7e08d3dd0ec0..6a50567f53a9 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.8.3
+version=4.10.1
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dgtk_doc=true
+ -Dbuild-tests=false -Dbuild-testsuite=false
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
@@ -30,9 +31,9 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 #changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-8/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-10/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=b362f968d085b4d3d9340d4d38c706377ded9d5374e694a2b6b7e6292e3cba74
+checksum=e8fcac04bc7715b9da667c911a5ee8f262e200d1d6a50adf23645ca8cfcd0311
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"

From 0a8f752b0dd94f9a762c216a7d0b1d818a0fe3be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:15:19 -0700
Subject: [PATCH 08/16] libadwaita: update to 1.3.1.

---
 srcpkgs/libadwaita/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index be7b11ce1478..69300f080e44 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.2.2
+version=1.3.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GTK4 building blocks for modern adaptive applications"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-2/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-3/NEWS"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=6958df0511e33867970d1077e3330a6f8c232da8d43434b6d60133a6982b8596
+checksum=6b8bbf413c501b46c8616a0e5b836d7a34091140941412520bbd9ddda6df8cbd
 make_check_pre="xvfb-run"
 
 build_options="gir gtk_doc"

From ca2dda9b73b54d2508845b5c3eaea628a6efca65 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 09/16] glib: update to 2.76.0.

---
 ...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  23 ++-
 .../fix-segfault-g_param_value_is_valid.patch |  35 -----
 srcpkgs/glib/patches/fix-test-cxxcpp.patch    |  26 ++++
 .../glib/patches/gnome-console-support.patch  |  62 --------
 srcpkgs/glib/patches/test-error-musl.patch    |  50 -------
 srcpkgs/glib/template                         |  15 +-
 7 files changed, 186 insertions(+), 163 deletions(-)
 create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
 delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
 create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
 delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
 delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch

diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function.  But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h   | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean             (g_str_has_prefix) (const gchar *str,
+     (g_str_has_suffix) (STR, SUFFIX)                                          \
+   )
+ 
+-#define g_strdup(STR)                                                         \
+-  (__builtin_constant_p ((STR)) ?                                             \
+-    (G_LIKELY ((STR) != NULL) ?                                               \
+-      G_GNUC_EXTENSION ({                                                     \
+-        const char *const ___str = ((STR));                                   \
+-        const char *const __str = _G_STR_NONNULL (___str);                    \
+-        const size_t __str_len = strlen (__str) + 1;                          \
+-        char *__dup_str = (char *) g_malloc (__str_len);                      \
+-        (char *) memcpy (__dup_str, __str, __str_len);                        \
+-      })                                                                      \
+-      :                                                                       \
+-      (char *) (NULL)                                                         \
+-    )                                                                         \
+-    :                                                                         \
+-    (g_strdup) ((STR))                                                        \
+-  )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar*                g_strjoin	       (const gchar  *separator,
+ 					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+ 
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++  if (__builtin_constant_p (!str) && !str)
++    return NULL;
++
++  if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++    {
++      const size_t len = strlen (str) + 1;
++      char *dup_str = (char *) g_malloc (len);
++      return (char *) memcpy (dup_str, str, len);
++    }
++
++  return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+  * sequences. Inverse of g_strescape. The recognized sequences are \b
+  * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+   g_free (str);
+ }
+ 
++static void
++test_strdup_macro_qualified (void)
++{
++  gchar *str;
++
++  g_assert_null (::g_strdup (NULL));
++
++  str = ::g_strdup ("C++ is cool too!");
++  g_assert_nonnull (str);
++  g_assert_cmpstr (str, ==, "C++ is cool too!");
++  g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++  struct
++  {
++    char *p, *q;
++  } strings = {
++    g_strdup (NULL),
++    g_strdup ("C++ is cool too!"),
++  };
++
++  g_assert_null (strings.p);
++  g_assert_nonnull (strings.q);
++  g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++  g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+   g_test_add_func ("/C++/str-equal", test_str_equal);
+   g_test_add_func ("/C++/strdup", test_strdup);
+   g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++  g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++  g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+   g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+   g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+   g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'converter-stream' : {},
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
  #  Test programs buildable on UNIX only
  if host_machine.system() != 'windows'
    gio_tests += {
@@ -16,7 +16,7 @@
      'gdbus-peer-object-manager' : {},
      'gdbus-sasl' : {},
      'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
        test_resources_binary2,
      ]
    endif
@@ -24,18 +24,17 @@
 -  gio_tests += {
 -    'resources' : {
 -      'extra_sources' : resources_extra_sources,
--      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--      'should_fail' : host_system == 'darwin',
+-      'depends' : resource_plugin,
 -    },
 -  }
  endif
  
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
 index d74617823..1de81a825 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--    'should_fail' : host_system == 'darwin',
+-    'can_fail' : host_system == 'darwin',
 -  },
    'dir' : {},
    'environment' : {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'error' : {},
 -  'fileutils' : {},
    'gdatetime' : {
      'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
+     'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
    'node' : {},
    'once' : {},
    'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec   *pspec,
- {
-   GParamSpec *param = value->data[0].v_pointer;
- 
-+  if (param == NULL)
-+    return FALSE;
-+
-   return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
- 
--- 
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int    *argc,
-   int i, j;
-   char **term_argv = NULL;
-   int term_argc = 0;
-+  gboolean pass_cmd_as_single_arg = FALSE;
-   char *check;
-   char **the_argv;
- 
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int    *argc,
-         }
-       else
-         {
-+          if (check == NULL) {
-+            check = g_find_program_in_path ("kgx");
-+            if (check != NULL)
-+              pass_cmd_as_single_arg = TRUE;
-+          }
-           if (check == NULL)
-             check = g_find_program_in_path ("tilix");
-           if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int    *argc,
-         }
-     }
- 
--  real_argc = term_argc + *argc;
-+  real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
-   real_argv = g_new (char *, real_argc + 1);
- 
-   for (i = 0; i < term_argc; i++)
-     real_argv[i] = term_argv[i];
- 
--  for (j = 0; j < *argc; j++, i++)
--    real_argv[i] = (char *)the_argv[j];
-+  if (pass_cmd_as_single_arg) {
-+    char **quoted_argv = g_new (char *, *argc + 1);
-+
-+    for (j = 0; j < *argc; j++) {
-+      quoted_argv[j] = g_shell_quote (the_argv[j]);
-+      g_free (the_argv[j]);
-+    }
-+    quoted_argv[j] = NULL;
-+
-+    real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+    g_strfreev (quoted_argv);
-+  } else {
-+    for (j = 0; j < *argc; j++, i++)
-+      real_argv[i] = (char *)the_argv[j];
-+  }
- 
-   real_argv[i] = NULL;
- 
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
-                          ...)
- {
--#ifdef __linux__
--  /* Only worth testing this on Linux; if other platforms regress on this legacy
--   * behaviour, we don’t care. In particular, calling g_error_new_valist() with
--   * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
--   * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
--   * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+  /* Only worth testing this on Linux with glibc; if other platforms regress on
-+   * this legacy behaviour, we don’t care. In particular, calling
-+   * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+   * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+   * fine: it’s a programmer error in either case. */
-   const struct
-     {
-       GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
- 
-       va_end (ap);
-     }
--#else  /* if !__linux__ */
--  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif  /* !__linux__ */
-+#else  /* if !__linux__ || !__GLIBC__ */
-+  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
- 
- static void
--- 
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
 make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
+post_patch() {
+	# Timer test is flaky on 32 bit (does float comparisons)
+	if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+		vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+	fi
+}
+
 pre_check() {
 	# machine-id is a random, non-zero value
 	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id

From 30a71cc3ee7bf2b1c7581856b19a06cbf9d0c6b1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 10/16] libpanel: update to 1.2.0.

---
 srcpkgs/libpanel/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
 # Template file for 'libpanel'
 pkgname=libpanel
-version=1.0.2
+version=1.2.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
 
 pre_build() {
 	# help gi-docgen find gi files on cross

From 1ef6ed22276bed204c081e928e967c2f8ef8f9aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:27:04 -0700
Subject: [PATCH 11/16] gtksourceview5: update to 5.8.0.

---
 srcpkgs/gtksourceview5/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 711194803bb0..0d24076811d7 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.6.2
+version=5.8.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="Text widget that extends GTK4 GtkTextView widget"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GtkSourceView"
-#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-6/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-8/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=1f146c156f135a60499d979e3577c99b6e15a111445767abe6219bb34c545c77
+checksum=110dd4c20def21886fbf777298fe0ef8cc2ad6023b8f36c7424411a414818933
 make_check_pre="xvfb-run"
 
 # Package build options

From 81a48eeeba9cdcd1493d7218e1de9de06b0e85ae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:33:38 -0700
Subject: [PATCH 12/16] jsonrpc-glib: update to 3.44.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 4ee57547f9dd..42d6762a8c64 100644
--- a/srcpkgs/jsonrpc-glib/template
+++ b/srcpkgs/jsonrpc-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'jsonrpc-glib'
 pkgname=jsonrpc-glib
-version=3.42.0
+version=3.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 changelog="https://gitlab.gnome.org/GNOME/jsonrpc-glib/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz"
-checksum=221989a57ca82a12467dc427822cd7651b0cad038140c931027bf1074208276b
+checksum=69406a0250d0cc5175408cae7eca80c0c6bfaefc4ae1830b354c0433bcd5ce06
 
 build_options="gir vala gtk_doc"
 build_options_default="gir vala gtk_doc"

From fca5884e0ebe40dbc1215af37a9316eb80ef1291 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:34:04 -0700
Subject: [PATCH 13/16] libpeas: update to 1.36.0.

---
 srcpkgs/libpeas/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index f7eba85d8336..8c85745f9c00 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
-version=1.34.0
-revision=2
+version=1.36.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Libpeas"
 changelog="https://gitlab.gnome.org/GNOME/libpeas/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libpeas/${version%.*}/libpeas-${version}.tar.xz"
-checksum=4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0
+checksum=297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c
 make_check_pre="xvfb-run"
 
 libpeas-devel_package() {

From 37422f6cd038ddd3cadd771a4be1b40d5677b3ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:34:34 -0700
Subject: [PATCH 14/16] template-glib: update to 3.36.1.

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

diff --git a/srcpkgs/template-glib/template b/srcpkgs/template-glib/template
index eaa26164b038..dd0e5c291710 100644
--- a/srcpkgs/template-glib/template
+++ b/srcpkgs/template-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'template-glib'
 pkgname=template-glib
-version=3.36.0
+version=3.36.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/template-glib"
 changelog="https://gitlab.gnome.org/GNOME/template-glib/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/template-glib/${version%.*}/template-glib-${version}.tar.xz"
-checksum=1c129525ae64403a662f7666f6358386a815668872acf11cb568ab39bba1f421
+checksum=3b167a17385ad745afbe20fadf8106c66d30c5bd746d5aa1d9bdb7e803f6a503
 
 template-glib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libgirepository-devel

From 59dc9f90b4e0f0f7f31a9c5f4d74349cf0bca3c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 15/16] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=43.4
+version=44.1
 revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From 5a69579c983385ac110139be8a4ad11abd6eb8af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 16/16] Komikku: downgrade to 0.41.0.

Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
 .../Komikku/patches/fix-appdata-file.patch    | 39 +++++++++++++++++++
 srcpkgs/Komikku/template                      | 13 ++++---
 2 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch

diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+ 
+     <screenshots>
+         <screenshot type="default">
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+         </screenshot>
+     </screenshots>
+ 
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 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"
 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=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (7 preceding siblings ...)
  2023-03-22 10:33 ` oreo639
@ 2023-03-22 17:11 ` paper42
  2023-03-22 20:48 ` [PR PATCH] [Updated] " oreo639
                   ` (33 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: paper42 @ 2023-03-22 17:11 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1479956323

Comment:
marking a draft because we need to merge #42916 and #42922 first

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (8 preceding siblings ...)
  2023-03-22 17:11 ` paper42
@ 2023-03-22 20:48 ` oreo639
  2023-03-22 22:44 ` oreo639
                   ` (32 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-22 20:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 43273 bytes --]

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

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 8 files changed, 31 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch

diff --git a/common/shlibs b/common/shlibs
index f972eebc4d3a..7639470721de 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,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 f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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-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/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 9d1686622d567e3441537b934d15b1d5b0668886 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 2/9] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From 06188a9cdaf57e9fc47fdef601964c443c84a875 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 3/9] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7639470721de..0e212ffd3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From c2204cb2a34cbb10d051868433eb41f1fbe3d442 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 4/9] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From 19ff7b5996a439282278aaece465b648feb463f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 5/9] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From 24d2c274e8009e5736b00bbe4141dce507b1a91c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 6/9] glib: update to 2.76.0.

---
 ...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  23 ++-
 .../fix-segfault-g_param_value_is_valid.patch |  35 -----
 srcpkgs/glib/patches/fix-test-cxxcpp.patch    |  26 ++++
 .../glib/patches/gnome-console-support.patch  |  62 --------
 srcpkgs/glib/patches/test-error-musl.patch    |  50 -------
 srcpkgs/glib/template                         |  15 +-
 7 files changed, 186 insertions(+), 163 deletions(-)
 create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
 delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
 create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
 delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
 delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch

diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function.  But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h   | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean             (g_str_has_prefix) (const gchar *str,
+     (g_str_has_suffix) (STR, SUFFIX)                                          \
+   )
+ 
+-#define g_strdup(STR)                                                         \
+-  (__builtin_constant_p ((STR)) ?                                             \
+-    (G_LIKELY ((STR) != NULL) ?                                               \
+-      G_GNUC_EXTENSION ({                                                     \
+-        const char *const ___str = ((STR));                                   \
+-        const char *const __str = _G_STR_NONNULL (___str);                    \
+-        const size_t __str_len = strlen (__str) + 1;                          \
+-        char *__dup_str = (char *) g_malloc (__str_len);                      \
+-        (char *) memcpy (__dup_str, __str, __str_len);                        \
+-      })                                                                      \
+-      :                                                                       \
+-      (char *) (NULL)                                                         \
+-    )                                                                         \
+-    :                                                                         \
+-    (g_strdup) ((STR))                                                        \
+-  )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar*                g_strjoin	       (const gchar  *separator,
+ 					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+ 
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++  if (__builtin_constant_p (!str) && !str)
++    return NULL;
++
++  if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++    {
++      const size_t len = strlen (str) + 1;
++      char *dup_str = (char *) g_malloc (len);
++      return (char *) memcpy (dup_str, str, len);
++    }
++
++  return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+  * sequences. Inverse of g_strescape. The recognized sequences are \b
+  * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+   g_free (str);
+ }
+ 
++static void
++test_strdup_macro_qualified (void)
++{
++  gchar *str;
++
++  g_assert_null (::g_strdup (NULL));
++
++  str = ::g_strdup ("C++ is cool too!");
++  g_assert_nonnull (str);
++  g_assert_cmpstr (str, ==, "C++ is cool too!");
++  g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++  struct
++  {
++    char *p, *q;
++  } strings = {
++    g_strdup (NULL),
++    g_strdup ("C++ is cool too!"),
++  };
++
++  g_assert_null (strings.p);
++  g_assert_nonnull (strings.q);
++  g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++  g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+   g_test_add_func ("/C++/str-equal", test_str_equal);
+   g_test_add_func ("/C++/strdup", test_strdup);
+   g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++  g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++  g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+   g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+   g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+   g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'converter-stream' : {},
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
  #  Test programs buildable on UNIX only
  if host_machine.system() != 'windows'
    gio_tests += {
@@ -16,7 +16,7 @@
      'gdbus-peer-object-manager' : {},
      'gdbus-sasl' : {},
      'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
        test_resources_binary2,
      ]
    endif
@@ -24,18 +24,17 @@
 -  gio_tests += {
 -    'resources' : {
 -      'extra_sources' : resources_extra_sources,
--      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--      'should_fail' : host_system == 'darwin',
+-      'depends' : resource_plugin,
 -    },
 -  }
  endif
  
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
 index d74617823..1de81a825 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--    'should_fail' : host_system == 'darwin',
+-    'can_fail' : host_system == 'darwin',
 -  },
    'dir' : {},
    'environment' : {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'error' : {},
 -  'fileutils' : {},
    'gdatetime' : {
      'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
+     'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
    'node' : {},
    'once' : {},
    'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec   *pspec,
- {
-   GParamSpec *param = value->data[0].v_pointer;
- 
-+  if (param == NULL)
-+    return FALSE;
-+
-   return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
- 
--- 
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int    *argc,
-   int i, j;
-   char **term_argv = NULL;
-   int term_argc = 0;
-+  gboolean pass_cmd_as_single_arg = FALSE;
-   char *check;
-   char **the_argv;
- 
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int    *argc,
-         }
-       else
-         {
-+          if (check == NULL) {
-+            check = g_find_program_in_path ("kgx");
-+            if (check != NULL)
-+              pass_cmd_as_single_arg = TRUE;
-+          }
-           if (check == NULL)
-             check = g_find_program_in_path ("tilix");
-           if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int    *argc,
-         }
-     }
- 
--  real_argc = term_argc + *argc;
-+  real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
-   real_argv = g_new (char *, real_argc + 1);
- 
-   for (i = 0; i < term_argc; i++)
-     real_argv[i] = term_argv[i];
- 
--  for (j = 0; j < *argc; j++, i++)
--    real_argv[i] = (char *)the_argv[j];
-+  if (pass_cmd_as_single_arg) {
-+    char **quoted_argv = g_new (char *, *argc + 1);
-+
-+    for (j = 0; j < *argc; j++) {
-+      quoted_argv[j] = g_shell_quote (the_argv[j]);
-+      g_free (the_argv[j]);
-+    }
-+    quoted_argv[j] = NULL;
-+
-+    real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+    g_strfreev (quoted_argv);
-+  } else {
-+    for (j = 0; j < *argc; j++, i++)
-+      real_argv[i] = (char *)the_argv[j];
-+  }
- 
-   real_argv[i] = NULL;
- 
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
-                          ...)
- {
--#ifdef __linux__
--  /* Only worth testing this on Linux; if other platforms regress on this legacy
--   * behaviour, we don’t care. In particular, calling g_error_new_valist() with
--   * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
--   * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
--   * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+  /* Only worth testing this on Linux with glibc; if other platforms regress on
-+   * this legacy behaviour, we don’t care. In particular, calling
-+   * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+   * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+   * fine: it’s a programmer error in either case. */
-   const struct
-     {
-       GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
- 
-       va_end (ap);
-     }
--#else  /* if !__linux__ */
--  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif  /* !__linux__ */
-+#else  /* if !__linux__ || !__GLIBC__ */
-+  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
- 
- static void
--- 
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
 make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
+post_patch() {
+	# Timer test is flaky on 32 bit (does float comparisons)
+	if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+		vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+	fi
+}
+
 pre_check() {
 	# machine-id is a random, non-zero value
 	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id

From d54c848a10dc7a8c7dbe4257d0af8c7cef47ec48 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 7/9] libpanel: update to 1.2.0.

---
 srcpkgs/libpanel/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
 # Template file for 'libpanel'
 pkgname=libpanel
-version=1.0.2
+version=1.2.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
 
 pre_build() {
 	# help gi-docgen find gi files on cross

From 72ae1de4e770b1c63e4574b08ce733918ee0965c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 8/9] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=43.4
+version=44.1
 revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From a62ae1136134c83f982e8d6153ab84aec0b1a3dd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 9/9] Komikku: downgrade to 0.41.0.

Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
 .../Komikku/patches/fix-appdata-file.patch    | 39 +++++++++++++++++++
 srcpkgs/Komikku/template                      | 13 ++++---
 2 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch

diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+ 
+     <screenshots>
+         <screenshot type="default">
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+         </screenshot>
+     </screenshots>
+ 
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 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"
 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=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (9 preceding siblings ...)
  2023-03-22 20:48 ` [PR PATCH] [Updated] " oreo639
@ 2023-03-22 22:44 ` oreo639
  2023-03-23 17:33 ` [PR REVIEW] " paper42
                   ` (31 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-22 22:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 44702 bytes --]

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

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 9 files changed, 54 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch

diff --git a/common/shlibs b/common/shlibs
index f972eebc4d3a..7639470721de 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,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 f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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-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/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..670c63bf5808
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+ 
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+-    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #ifdef __GLIBC__
++        static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #else
++        static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #fi
+ 
+     if (s_currentContext == this)
+         return true;
+-- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 bcdfe8ea637800f08fff861289707018a3110f97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 2/9] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From 7c9bc6c733111a9c49c772a96f583cd49178e8c9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 3/9] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7639470721de..0e212ffd3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From 6c89d67ffb6d191163bece2150cb3a110676fdae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 4/9] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From c88fda4873e04d4477bf3836627b8ff23c265e13 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 5/9] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From 3541743296896a9f931bd2f3dee2065f1ea25954 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 6/9] glib: update to 2.76.0.

---
 ...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  23 ++-
 .../fix-segfault-g_param_value_is_valid.patch |  35 -----
 srcpkgs/glib/patches/fix-test-cxxcpp.patch    |  26 ++++
 .../glib/patches/gnome-console-support.patch  |  62 --------
 srcpkgs/glib/patches/test-error-musl.patch    |  50 -------
 srcpkgs/glib/template                         |  15 +-
 7 files changed, 186 insertions(+), 163 deletions(-)
 create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
 delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
 create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
 delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
 delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch

diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function.  But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h   | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean             (g_str_has_prefix) (const gchar *str,
+     (g_str_has_suffix) (STR, SUFFIX)                                          \
+   )
+ 
+-#define g_strdup(STR)                                                         \
+-  (__builtin_constant_p ((STR)) ?                                             \
+-    (G_LIKELY ((STR) != NULL) ?                                               \
+-      G_GNUC_EXTENSION ({                                                     \
+-        const char *const ___str = ((STR));                                   \
+-        const char *const __str = _G_STR_NONNULL (___str);                    \
+-        const size_t __str_len = strlen (__str) + 1;                          \
+-        char *__dup_str = (char *) g_malloc (__str_len);                      \
+-        (char *) memcpy (__dup_str, __str, __str_len);                        \
+-      })                                                                      \
+-      :                                                                       \
+-      (char *) (NULL)                                                         \
+-    )                                                                         \
+-    :                                                                         \
+-    (g_strdup) ((STR))                                                        \
+-  )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar*                g_strjoin	       (const gchar  *separator,
+ 					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+ 
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++  if (__builtin_constant_p (!str) && !str)
++    return NULL;
++
++  if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++    {
++      const size_t len = strlen (str) + 1;
++      char *dup_str = (char *) g_malloc (len);
++      return (char *) memcpy (dup_str, str, len);
++    }
++
++  return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+  * sequences. Inverse of g_strescape. The recognized sequences are \b
+  * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+   g_free (str);
+ }
+ 
++static void
++test_strdup_macro_qualified (void)
++{
++  gchar *str;
++
++  g_assert_null (::g_strdup (NULL));
++
++  str = ::g_strdup ("C++ is cool too!");
++  g_assert_nonnull (str);
++  g_assert_cmpstr (str, ==, "C++ is cool too!");
++  g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++  struct
++  {
++    char *p, *q;
++  } strings = {
++    g_strdup (NULL),
++    g_strdup ("C++ is cool too!"),
++  };
++
++  g_assert_null (strings.p);
++  g_assert_nonnull (strings.q);
++  g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++  g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+   g_test_add_func ("/C++/str-equal", test_str_equal);
+   g_test_add_func ("/C++/strdup", test_strdup);
+   g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++  g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++  g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+   g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+   g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+   g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'converter-stream' : {},
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
  #  Test programs buildable on UNIX only
  if host_machine.system() != 'windows'
    gio_tests += {
@@ -16,7 +16,7 @@
      'gdbus-peer-object-manager' : {},
      'gdbus-sasl' : {},
      'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
        test_resources_binary2,
      ]
    endif
@@ -24,18 +24,17 @@
 -  gio_tests += {
 -    'resources' : {
 -      'extra_sources' : resources_extra_sources,
--      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--      'should_fail' : host_system == 'darwin',
+-      'depends' : resource_plugin,
 -    },
 -  }
  endif
  
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
 index d74617823..1de81a825 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--    'should_fail' : host_system == 'darwin',
+-    'can_fail' : host_system == 'darwin',
 -  },
    'dir' : {},
    'environment' : {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'error' : {},
 -  'fileutils' : {},
    'gdatetime' : {
      'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
+     'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
    'node' : {},
    'once' : {},
    'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec   *pspec,
- {
-   GParamSpec *param = value->data[0].v_pointer;
- 
-+  if (param == NULL)
-+    return FALSE;
-+
-   return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
- 
--- 
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int    *argc,
-   int i, j;
-   char **term_argv = NULL;
-   int term_argc = 0;
-+  gboolean pass_cmd_as_single_arg = FALSE;
-   char *check;
-   char **the_argv;
- 
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int    *argc,
-         }
-       else
-         {
-+          if (check == NULL) {
-+            check = g_find_program_in_path ("kgx");
-+            if (check != NULL)
-+              pass_cmd_as_single_arg = TRUE;
-+          }
-           if (check == NULL)
-             check = g_find_program_in_path ("tilix");
-           if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int    *argc,
-         }
-     }
- 
--  real_argc = term_argc + *argc;
-+  real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
-   real_argv = g_new (char *, real_argc + 1);
- 
-   for (i = 0; i < term_argc; i++)
-     real_argv[i] = term_argv[i];
- 
--  for (j = 0; j < *argc; j++, i++)
--    real_argv[i] = (char *)the_argv[j];
-+  if (pass_cmd_as_single_arg) {
-+    char **quoted_argv = g_new (char *, *argc + 1);
-+
-+    for (j = 0; j < *argc; j++) {
-+      quoted_argv[j] = g_shell_quote (the_argv[j]);
-+      g_free (the_argv[j]);
-+    }
-+    quoted_argv[j] = NULL;
-+
-+    real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+    g_strfreev (quoted_argv);
-+  } else {
-+    for (j = 0; j < *argc; j++, i++)
-+      real_argv[i] = (char *)the_argv[j];
-+  }
- 
-   real_argv[i] = NULL;
- 
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
-                          ...)
- {
--#ifdef __linux__
--  /* Only worth testing this on Linux; if other platforms regress on this legacy
--   * behaviour, we don’t care. In particular, calling g_error_new_valist() with
--   * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
--   * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
--   * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+  /* Only worth testing this on Linux with glibc; if other platforms regress on
-+   * this legacy behaviour, we don’t care. In particular, calling
-+   * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+   * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+   * fine: it’s a programmer error in either case. */
-   const struct
-     {
-       GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
- 
-       va_end (ap);
-     }
--#else  /* if !__linux__ */
--  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif  /* !__linux__ */
-+#else  /* if !__linux__ || !__GLIBC__ */
-+  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
- 
- static void
--- 
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
 make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
+post_patch() {
+	# Timer test is flaky on 32 bit (does float comparisons)
+	if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+		vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+	fi
+}
+
 pre_check() {
 	# machine-id is a random, non-zero value
 	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id

From 3480a574563a8e80fdea9992ea68d8df1a8450ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 7/9] libpanel: update to 1.2.0.

---
 srcpkgs/libpanel/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
 # Template file for 'libpanel'
 pkgname=libpanel
-version=1.0.2
+version=1.2.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
 
 pre_build() {
 	# help gi-docgen find gi files on cross

From 67ad9daaa95937b1f0641360e991052d6e0a29b9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 8/9] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=43.4
+version=44.1
 revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From 97c221c9f54ea4d9f602afd6278d4b9ddb3fed40 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 9/9] Komikku: downgrade to 0.41.0.

Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
 .../Komikku/patches/fix-appdata-file.patch    | 39 +++++++++++++++++++
 srcpkgs/Komikku/template                      | 13 ++++---
 2 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch

diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+ 
+     <screenshots>
+         <screenshot type="default">
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+         </screenshot>
+     </screenshots>
+ 
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 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"
 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=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR REVIEW] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (10 preceding siblings ...)
  2023-03-22 22:44 ` oreo639
@ 2023-03-23 17:33 ` paper42
  2023-03-23 19:05 ` [PR PATCH] [Updated] " oreo639
                   ` (30 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: paper42 @ 2023-03-23 17:33 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#discussion_r1146553499

Comment:
```suggestion
+    #endif
```

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (11 preceding siblings ...)
  2023-03-23 17:33 ` [PR REVIEW] " paper42
@ 2023-03-23 19:05 ` oreo639
  2023-03-23 19:05 ` [PR REVIEW] " oreo639
                   ` (29 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-23 19:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 44705 bytes --]

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

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 9 files changed, 54 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch

diff --git a/common/shlibs b/common/shlibs
index f972eebc4d3a..7639470721de 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,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 f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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-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/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+ 
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+-    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #ifdef __GLIBC__
++        static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #else
++        static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #endif
+ 
+     if (s_currentContext == this)
+         return true;
+-- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 6d5b2a36808504d298f4f7a3bac0e59fe6b5a274 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 2/9] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From 030b792cad19964221563286e7a6f296a5113553 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 3/9] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7639470721de..0e212ffd3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From 6b3daedcfe0d0d82d18b31319d30a5f5482574d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 4/9] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From 36071954f93fc3215af1d2a4f6775a4291a4fe3c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 5/9] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From c9da405febfdb0ae1799e1f46d1b847d3136c3ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 6/9] glib: update to 2.76.0.

---
 ...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  23 ++-
 .../fix-segfault-g_param_value_is_valid.patch |  35 -----
 srcpkgs/glib/patches/fix-test-cxxcpp.patch    |  26 ++++
 .../glib/patches/gnome-console-support.patch  |  62 --------
 srcpkgs/glib/patches/test-error-musl.patch    |  50 -------
 srcpkgs/glib/template                         |  15 +-
 7 files changed, 186 insertions(+), 163 deletions(-)
 create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
 delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
 create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
 delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
 delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch

diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function.  But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h   | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean             (g_str_has_prefix) (const gchar *str,
+     (g_str_has_suffix) (STR, SUFFIX)                                          \
+   )
+ 
+-#define g_strdup(STR)                                                         \
+-  (__builtin_constant_p ((STR)) ?                                             \
+-    (G_LIKELY ((STR) != NULL) ?                                               \
+-      G_GNUC_EXTENSION ({                                                     \
+-        const char *const ___str = ((STR));                                   \
+-        const char *const __str = _G_STR_NONNULL (___str);                    \
+-        const size_t __str_len = strlen (__str) + 1;                          \
+-        char *__dup_str = (char *) g_malloc (__str_len);                      \
+-        (char *) memcpy (__dup_str, __str, __str_len);                        \
+-      })                                                                      \
+-      :                                                                       \
+-      (char *) (NULL)                                                         \
+-    )                                                                         \
+-    :                                                                         \
+-    (g_strdup) ((STR))                                                        \
+-  )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar*                g_strjoin	       (const gchar  *separator,
+ 					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+ 
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++  if (__builtin_constant_p (!str) && !str)
++    return NULL;
++
++  if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++    {
++      const size_t len = strlen (str) + 1;
++      char *dup_str = (char *) g_malloc (len);
++      return (char *) memcpy (dup_str, str, len);
++    }
++
++  return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+  * sequences. Inverse of g_strescape. The recognized sequences are \b
+  * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+   g_free (str);
+ }
+ 
++static void
++test_strdup_macro_qualified (void)
++{
++  gchar *str;
++
++  g_assert_null (::g_strdup (NULL));
++
++  str = ::g_strdup ("C++ is cool too!");
++  g_assert_nonnull (str);
++  g_assert_cmpstr (str, ==, "C++ is cool too!");
++  g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++  struct
++  {
++    char *p, *q;
++  } strings = {
++    g_strdup (NULL),
++    g_strdup ("C++ is cool too!"),
++  };
++
++  g_assert_null (strings.p);
++  g_assert_nonnull (strings.q);
++  g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++  g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+   g_test_add_func ("/C++/str-equal", test_str_equal);
+   g_test_add_func ("/C++/strdup", test_strdup);
+   g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++  g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++  g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+   g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+   g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+   g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'converter-stream' : {},
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
  #  Test programs buildable on UNIX only
  if host_machine.system() != 'windows'
    gio_tests += {
@@ -16,7 +16,7 @@
      'gdbus-peer-object-manager' : {},
      'gdbus-sasl' : {},
      'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
        test_resources_binary2,
      ]
    endif
@@ -24,18 +24,17 @@
 -  gio_tests += {
 -    'resources' : {
 -      'extra_sources' : resources_extra_sources,
--      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--      'should_fail' : host_system == 'darwin',
+-      'depends' : resource_plugin,
 -    },
 -  }
  endif
  
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
 index d74617823..1de81a825 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--    'should_fail' : host_system == 'darwin',
+-    'can_fail' : host_system == 'darwin',
 -  },
    'dir' : {},
    'environment' : {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-     'should_fail' : host_system == 'darwin',
+     'can_fail' : host_system == 'darwin',
    },
 -  'error' : {},
 -  'fileutils' : {},
    'gdatetime' : {
      'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
+     'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
    'node' : {},
    'once' : {},
    'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec   *pspec,
- {
-   GParamSpec *param = value->data[0].v_pointer;
- 
-+  if (param == NULL)
-+    return FALSE;
-+
-   return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
- 
--- 
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+-  g_test_init (&argc, &argv, NULL);
++  g_test_init (&argc, &argv, nullptr);
+ #else
+   g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int    *argc,
-   int i, j;
-   char **term_argv = NULL;
-   int term_argc = 0;
-+  gboolean pass_cmd_as_single_arg = FALSE;
-   char *check;
-   char **the_argv;
- 
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int    *argc,
-         }
-       else
-         {
-+          if (check == NULL) {
-+            check = g_find_program_in_path ("kgx");
-+            if (check != NULL)
-+              pass_cmd_as_single_arg = TRUE;
-+          }
-           if (check == NULL)
-             check = g_find_program_in_path ("tilix");
-           if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int    *argc,
-         }
-     }
- 
--  real_argc = term_argc + *argc;
-+  real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
-   real_argv = g_new (char *, real_argc + 1);
- 
-   for (i = 0; i < term_argc; i++)
-     real_argv[i] = term_argv[i];
- 
--  for (j = 0; j < *argc; j++, i++)
--    real_argv[i] = (char *)the_argv[j];
-+  if (pass_cmd_as_single_arg) {
-+    char **quoted_argv = g_new (char *, *argc + 1);
-+
-+    for (j = 0; j < *argc; j++) {
-+      quoted_argv[j] = g_shell_quote (the_argv[j]);
-+      g_free (the_argv[j]);
-+    }
-+    quoted_argv[j] = NULL;
-+
-+    real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+    g_strfreev (quoted_argv);
-+  } else {
-+    for (j = 0; j < *argc; j++, i++)
-+      real_argv[i] = (char *)the_argv[j];
-+  }
- 
-   real_argv[i] = NULL;
- 
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
-                          ...)
- {
--#ifdef __linux__
--  /* Only worth testing this on Linux; if other platforms regress on this legacy
--   * behaviour, we don’t care. In particular, calling g_error_new_valist() with
--   * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
--   * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
--   * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+  /* Only worth testing this on Linux with glibc; if other platforms regress on
-+   * this legacy behaviour, we don’t care. In particular, calling
-+   * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+   * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+   * fine: it’s a programmer error in either case. */
-   const struct
-     {
-       GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
- 
-       va_end (ap);
-     }
--#else  /* if !__linux__ */
--  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif  /* !__linux__ */
-+#else  /* if !__linux__ || !__GLIBC__ */
-+  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
- 
- static void
--- 
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
 make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
+post_patch() {
+	# Timer test is flaky on 32 bit (does float comparisons)
+	if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+		vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+	fi
+}
+
 pre_check() {
 	# machine-id is a random, non-zero value
 	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id

From 857c429577dad42e3e9095081bd4426f5ff83320 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 7/9] libpanel: update to 1.2.0.

---
 srcpkgs/libpanel/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
 # Template file for 'libpanel'
 pkgname=libpanel
-version=1.0.2
+version=1.2.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
 
 pre_build() {
 	# help gi-docgen find gi files on cross

From 0a791083b7b1dd20801176ecd37c21e6b069e958 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 8/9] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=43.4
+version=44.1
 revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From e286a9d49fe33c851417e4c4500c3430049ff079 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 9/9] Komikku: downgrade to 0.41.0.

Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
 .../Komikku/patches/fix-appdata-file.patch    | 39 +++++++++++++++++++
 srcpkgs/Komikku/template                      | 13 ++++---
 2 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch

diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+ 
+     <screenshots>
+         <screenshot type="default">
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+         </screenshot>
+         <screenshot>
+-            <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++            <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+         </screenshot>
+     </screenshots>
+ 
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 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"
 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=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR REVIEW] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (12 preceding siblings ...)
  2023-03-23 19:05 ` [PR PATCH] [Updated] " oreo639
@ 2023-03-23 19:05 ` oreo639
  2023-03-24 20:18 ` icp1994
                   ` (28 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-23 19:05 UTC (permalink / raw)
  To: ml

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

New review comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#discussion_r1146699071

Comment:
Thanks.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (13 preceding siblings ...)
  2023-03-23 19:05 ` [PR REVIEW] " oreo639
@ 2023-03-24 20:18 ` icp1994
  2023-03-24 20:43 ` oreo639
                   ` (27 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: icp1994 @ 2023-03-24 20:18 UTC (permalink / raw)
  To: ml

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1483360296

Comment:
If you wait for a bit Komikku might be resolved upstream soon https://gitlab.com/valos/Komikku/-/merge_requests/195

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (14 preceding siblings ...)
  2023-03-24 20:18 ` icp1994
@ 2023-03-24 20:43 ` oreo639
  2023-03-26 22:04 ` oreo639
                   ` (26 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-24 20:43 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1483384558

Comment:
> If you wait for a bit Komikku might be resolved upstream soon https://gitlab.com/valos/Komikku/-/merge_requests/195

I'll update it when it gets resolved, but I don't anticipate that getting merged sooon.

> Also, this patch seems to break japscan and readcomiconline.

> I do not have enough time to solve the patch right now. And, this patch making any server depending on WebkitGTK fail anyway, it might be wiser to just delete both sources in f38, although I do not know the effect it might have on users using the source upgrading to f38.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (15 preceding siblings ...)
  2023-03-24 20:43 ` oreo639
@ 2023-03-26 22:04 ` oreo639
  2023-03-26 22:04 ` oreo639
                   ` (25 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-26 22:04 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1484237857

Comment:
Alright, I does look like Komikku is working on it now, I'll update it in the next release.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (16 preceding siblings ...)
  2023-03-26 22:04 ` oreo639
@ 2023-03-26 22:04 ` oreo639
  2023-03-30 21:22 ` paper42
                   ` (24 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-26 22:04 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1484237857

Comment:
Alright, it does look like Komikku is working on it now, I'll update it in the next release.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (17 preceding siblings ...)
  2023-03-26 22:04 ` oreo639
@ 2023-03-30 21:22 ` paper42
  2023-03-30 22:34 ` oreo639
                   ` (23 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: paper42 @ 2023-03-30 21:22 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1490979835

Comment:
Komikku released a version 1.17.0 which includes this commit https://gitlab.com/valos/Komikku/-/merge_requests/208/diffs which adds support for webkitgtk-6.0, the update PR is here: #43124

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (18 preceding siblings ...)
  2023-03-30 21:22 ` paper42
@ 2023-03-30 22:34 ` oreo639
  2023-03-30 22:54 ` [PR PATCH] [Updated] " oreo639
                   ` (22 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-30 22:34 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1491052373

Comment:
Thank you.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (19 preceding siblings ...)
  2023-03-30 22:34 ` oreo639
@ 2023-03-30 22:54 ` oreo639
  2023-04-01 19:48 ` oreo639
                   ` (21 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-03-30 22:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 30055 bytes --]

From 4ae88d3ac2053e7561cf696539671d58675c4a59 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/11] webkit2gtk: update to 2.40.0.

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 9 files changed, 54 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch

diff --git a/common/shlibs b/common/shlibs
index 840a0c3197ab..3fb4353d06ef 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,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 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,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-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/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+ 
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+-    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #ifdef __GLIBC__
++        static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #else
++        static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #endif
+ 
+     if (s_currentContext == this)
+         return true;
+-- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 9bfbb30ce3474cd29a3c6a53a426ef40831e0a20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/11] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From eb9cf109559892449f1c5e2eabb45c1f2f2b3a81 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/11] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3fb4353d06ef..87f4dbe2a316 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From 4f7db7c2f447746b67ee615caf4f94468aae82ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/11] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From 89f925985bb665ea42c42aa6a5c67aacbd54796b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/11] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From b51499b340331fde34dbf93815446d800dab874c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 06/11] libpanel: update to 1.2.0.

---
 srcpkgs/libpanel/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
 # Template file for 'libpanel'
 pkgname=libpanel
-version=1.0.2
+version=1.2.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
 
 pre_build() {
 	# help gi-docgen find gi files on cross

From 3f5a2eae6b1e38e4b91277c89e3a5ff2e560108f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 07/11] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=43.4
+version=44.1
 revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From a56356062b095405f4c886db1eb38f8ca43a19b1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 30 Mar 2023 23:11:19 +0200
Subject: [PATCH 08/11] New package: python3-emoji-2.4.0

---
 srcpkgs/python3-emoji/template | 19 +++++++++++++++++++
 1 file changed, 19 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..b5b4d0c0c35f
--- /dev/null
+++ b/srcpkgs/python3-emoji/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-emoji'
+pkgname=python3-emoji
+version=2.4.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Emoji terminal output for Python"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/carpedm20/emoji"
+changelog="https://raw.githubusercontent.com/carpedm20/emoji/master/CHANGES.md"
+distfiles="https://github.com/carpedm20/emoji/archive/refs/tags/v${version}.tar.gz"
+checksum=b5474a9dbf8ddad3db0878caee4a5d76e40ef0e7e28b2dd07fedf9548a465c53
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 7cf4a91b26ddacae81843399df3d9d048ffac36a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 30 Mar 2023 23:16:45 +0200
Subject: [PATCH 09/11] New package: python3-piexif-1.1.3

---
 .../python3-piexif/patches/pillow-7.2.patch   | 40 +++++++++++++++++++
 srcpkgs/python3-piexif/template               | 18 +++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 srcpkgs/python3-piexif/patches/pillow-7.2.patch
 create mode 100644 srcpkgs/python3-piexif/template

diff --git a/srcpkgs/python3-piexif/patches/pillow-7.2.patch b/srcpkgs/python3-piexif/patches/pillow-7.2.patch
new file mode 100644
index 000000000000..b13425a0fc21
--- /dev/null
+++ b/srcpkgs/python3-piexif/patches/pillow-7.2.patch
@@ -0,0 +1,40 @@
+From 5209b53e9689ce28dcd045f384633378d619718f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Wi=C5=9Bniewski?= <vuko@vuko.pl>
+Date: Thu, 5 Nov 2020 16:18:52 +0100
+Subject: [PATCH] convert IFDRational to tuples in tests
+
+This fixes tests with Pillow version >= 7.2.0
+---
+ tests/s_test.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/tests/s_test.py b/tests/s_test.py
+index 5d105de..a7cad54 100644
+--- a/tests/s_test.py
++++ b/tests/s_test.py
+@@ -9,6 +9,7 @@
+ import time
+ import unittest
+ 
++import PIL
+ from PIL import Image
+ import piexif
+ from piexif import _common, ImageIFD, ExifIFD, GPSIFD, TAGS, InvalidImageDataError
+@@ -580,6 +581,17 @@ def test_print_exif(self):
+ # test utility methods----------------------------------------------
+ 
+     def _compare_value(self, v1, v2):
++        if isinstance(v2, PIL.TiffImagePlugin.IFDRational):
++            v2 = (v2.numerator, v2.denominator)
++        if isinstance(v2, tuple):
++            converted_v2 = []
++            for el in v2:
++                if isinstance(el, PIL.TiffImagePlugin.IFDRational):
++                    converted_v2.append((el.numerator, el.denominator))
++                else:
++                    converted_v2.append(el)
++            v2 = tuple(converted_v2)
++
+         if type(v1) != type(v2):
+             if isinstance(v1, tuple):
+                 self.assertEqual(pack_byte(*v1), v2)
diff --git a/srcpkgs/python3-piexif/template b/srcpkgs/python3-piexif/template
new file mode 100644
index 000000000000..ff8362c0c658
--- /dev/null
+++ b/srcpkgs/python3-piexif/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-piexif'
+pkgname=python3-piexif
+version=1.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-Pillow"
+short_desc="Exif manipulation with pure python script"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="MIT"
+homepage="https://github.com/hMatoba/Piexif"
+distfiles="https://github.com/hMatoba/Piexif/archive/refs/tags/${version}.tar.gz"
+checksum=abfd9a67795e23d7a76f9407d60841efa68c5d6e43376b295bb821a30602c569
+
+post_install() {
+	vlicense LICENSE.txt
+}

From e393ce749386168a06a4f86ca195eb0de24b7e6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 30 Mar 2023 23:18:03 +0200
Subject: [PATCH 10/11] Komikku: update to 1.17.0.

---
 srcpkgs/Komikku/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..fad699b5d4ac 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.1.0
-revision=2
+version=1.17.0
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
 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-gobject python3-keyring python3-lxml python3-magic python3-rarfile
+ python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-piexif"
 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=a7530ca30eb15a8bc1892c57ca79553664ebce843c7c99e59ee3e85e8db22f7d

From 01c2962be6186a9d94b8a51f6169da8d6bc213cd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 30 Mar 2023 15:42:50 -0700
Subject: [PATCH 11/11] Komikku: rebuild for libwebkitgtk60

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fad699b5d4ac..ceb56424353c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=1.17.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
@@ -9,7 +9,7 @@ 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-rarfile
- python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60
  python3-piexif"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (20 preceding siblings ...)
  2023-03-30 22:54 ` [PR PATCH] [Updated] " oreo639
@ 2023-04-01 19:48 ` oreo639
  2023-04-01 19:50 ` oreo639
                   ` (20 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-01 19:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 22916 bytes --]

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

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 9 files changed, 54 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch

diff --git a/common/shlibs b/common/shlibs
index ddd0a3266a36..f2f392b6b45f 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1143,6 +1143,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 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,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-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/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+ 
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+-    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #ifdef __GLIBC__
++        static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #else
++        static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #endif
+ 
+     if (s_currentContext == this)
+         return true;
+-- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 fb73ecb06d9d3e0f5d482cea05236f05110d4183 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 2/7] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From 35d40d7b9b4db5abac02bc5cfe8955d0ef25a532 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 3/7] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f2f392b6b45f..4af39bae735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From 308dd0eb765015add52b4b8844e7a579f7570b7b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 4/7] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From ffc67ee2c336f27d4fa370eefb4e304eb05bc3c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 5/7] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From 768dcac1cbb4173705bccbca8159c35f189ce4e1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 6/7] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a92360e98674..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=43.4
-revision=2
+version=44.1
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From 054552ba49f7c9cc64138b8b6b274fbad59c0a43 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 30 Mar 2023 15:42:50 -0700
Subject: [PATCH 7/7] Komikku: rebuild for libwebkitgtk60

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fad699b5d4ac..ceb56424353c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=1.17.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
@@ -9,7 +9,7 @@ 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-rarfile
- python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60
  python3-piexif"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (21 preceding siblings ...)
  2023-04-01 19:48 ` oreo639
@ 2023-04-01 19:50 ` oreo639
  2023-04-02  9:04 ` paper42
                   ` (19 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-01 19:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 22779 bytes --]

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

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 -----------
 srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
 srcpkgs/webkit2gtk/template                   | 46 +++++++++----------
 9 files changed, 54 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch

diff --git a/common/shlibs b/common/shlibs
index ddd0a3266a36..f2f392b6b45f 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1143,6 +1143,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 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,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-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/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+ 
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+-    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #ifdef __GLIBC__
++        static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #else
++        static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #endif
+ 
+     if (s_currentContext == this)
+         return true;
+-- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 fb73ecb06d9d3e0f5d482cea05236f05110d4183 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 2/7] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From 35d40d7b9b4db5abac02bc5cfe8955d0ef25a532 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 3/7] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f2f392b6b45f..4af39bae735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From 308dd0eb765015add52b4b8844e7a579f7570b7b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 4/7] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From ffc67ee2c336f27d4fa370eefb4e304eb05bc3c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 5/7] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From 2242bcda05e34416a55d12b587f0f682373713dd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 6/7] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a92360e98674..264943b2328b 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=2
+version=44.1
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -10,23 +10,18 @@ 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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From cf8b9962e4e8b443d310e6b23bab193e6d6d9c1d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 30 Mar 2023 15:42:50 -0700
Subject: [PATCH 7/7] Komikku: rebuild for libwebkitgtk60

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fad699b5d4ac..ceb56424353c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=1.17.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
@@ -9,7 +9,7 @@ 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-rarfile
- python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60
  python3-piexif"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (22 preceding siblings ...)
  2023-04-01 19:50 ` oreo639
@ 2023-04-02  9:04 ` paper42
  2023-04-02 20:10 ` oreo639
                   ` (18 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: paper42 @ 2023-04-02  9:04 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493272680

Comment:
Cross compiling to armv6l-musl with -j10 fails for me with:
```
[70/5186] Building CXX object Source/ThirdParty/ANGLE/CMakeFiles/ANGLE.dir/src/libANGLE/renderer/gl/ContextGL.cpp.o
FAILED: Source/ThirdParty/ANGLE/CMakeFiles/ANGLE.dir/src/libANGLE/renderer/gl/ContextGL.cpp.o 
/usr/bin/ccache /builddir/.xbps-webkit2gtk/wrappers/arm-linux-musleabihf-c++ -DANGLE_ENABLE_ESSL -DANGLE_ENABLE_GLSL -DANGLE_ENABLE_OPENGL -DANGLE_PLATFORM_LINUX -DBUILDING_GTK__=1 -DBUILDING_WEBKIT=1 -DBUILDING_WITH_CMAKE=1 -DBWRAP_EXECUTABLE=\"/usr/bin/bwrap\" -DDBUS_PROXY_EXECUTABLE=\"/usr/bin/xdg-dbus-proxy\" -DEGL_EGL_PROTOTYPES=0 -DEGL_NO_PLATFORM_SPECIFIC_TYPES -DGETTEXT_PACKAGE=\"WebKitGTK-4.1\" -DGL_GLES_PROTOTYPES=0 -DHAVE_CONFIG_H=1 -DJSC_GLIB_API_ENABLED -DLIBANGLE_IMPLEMENTATION -DPAS_BMALLOC=1 -DUSE_SYSTEM_EGL -I/builddir/webkit2gtk-2.40.0/Source/ThirdParty/ANGLE/include -I/builddir/webkit2gtk-2.40.0/Source/ThirdParty/ANGLE/include/KHR -I/builddir/webkit2gtk-2.40.0/Source/ThirdParty/ANGLE/src -I/builddir/webkit2gtk-2.40.0/Source/ThirdParty/ANGLE/src/common/base -I/builddir/webkit2gtk-2.40.0/Source/ThirdParty/ANGLE/src/common/third_party/xxhash -I/builddir/webkit2gtk-2.40.0/Source/ThirdParty/ANGLE/third_party/zlib/google -I/builddir/webkit2gtk-2.40.0/build/Source/ThirdParty/ANGLE/include -fdiagnostics-color=always -Wextra -Wall -pipe -fmax-errors=20 -Wno-odr -Wno-stringop-overread -Wno-stringop-overflow -Wno-nonnull -Wno-array-bounds -Wno-expansion-to-defined -Wno-noexcept-type -Wno-psabi -Wno-misleading-indentation -Wno-maybe-uninitialized -Wundef -Wpointer-arith -Wmissing-format-attribute -Wformat-security -Wcast-align -Wno-tautological-compare -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard -DNDEBUG  -I/usr/arm-linux-musleabihf/usr/include -ffile-prefix-map=/builddir/webkit2gtk-2.40.0/build=. -fno-strict-aliasing -fno-exceptions -fno-rtti -fPIC -fvisibility=hidden -w -std=c++20 -MD -MT Source/ThirdParty/ANGLE/CMakeFiles/ANGLE.dir/src/libANGLE/renderer/gl/ContextGL.cpp.o -MF Source/ThirdParty/ANGLE/CMakeFiles/ANGLE.dir/src/libANGLE/renderer/gl/ContextGL.cpp.o.d -o Source/ThirdParty/ANGLE/CMakeFiles/ANGLE.dir/src/libANGLE/renderer/gl/ContextGL.cpp.o -c /builddir/webkit2gtk-2.40.0/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.cpp
In file included from ../Source/ThirdParty/ANGLE/src/libANGLE/RefCountObject.h:20,
                 from ../Source/ThirdParty/ANGLE/src/libANGLE/angletypes.h:19,
                 from ../Source/ThirdParty/ANGLE/src/libANGLE/Caps.h:12,
                 from ../Source/ThirdParty/ANGLE/src/libANGLE/GLES1State.h:20,
                 from ../Source/ThirdParty/ANGLE/src/libANGLE/State.h:19,
                 from ../Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.h:16,
                 from ../Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.h:13,
                 from ../Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.cpp:10:
../Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h:132:37: error: static assertion failed: Must always be lock free
  132 |     static_assert(decltype(mValue)::is_always_lock_free, "Must always be lock free");
      |
```
continuing with -j1 seems to make it work, but I am not sure why, so it's possible it would also fail a few minutes in.
there is a bug report upstream about this: https://bugs.webkit.org/show_bug.cgi?id=252670

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (23 preceding siblings ...)
  2023-04-02  9:04 ` paper42
@ 2023-04-02 20:10 ` oreo639
  2023-04-02 20:10 ` oreo639
                   ` (17 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 20:10 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493429282

Comment:
Thank you for pointing that out.
The value of `std::atomic<uint32_t>::is_always_lock_free` depends on the value of `ATOMIC_LLONG_LOCK_FREE`:
https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/include/std/atomic#L931

https://en.cppreference.com/w/c/atomic/ATOMIC_LOCK_FREE_consts

With `ATOMIC_LLONG_LOCK_FREE = 1` on armv[67].

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (24 preceding siblings ...)
  2023-04-02 20:10 ` oreo639
@ 2023-04-02 20:10 ` oreo639
  2023-04-02 20:12 ` oreo639
                   ` (16 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 20:10 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493429282

Comment:
Thank you for pointing that out.
The value of `std::atomic<uint32_t>::is_always_lock_free` depends on the value of `ATOMIC_LLONG_LOCK_FREE`:
https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/include/std/atomic#L931

https://en.cppreference.com/w/c/atomic/ATOMIC_LOCK_FREE_consts

With `ATOMIC_LLONG_LOCK_FREE = 1` on armv[67]. (meaning "sometimes lock free" )

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (25 preceding siblings ...)
  2023-04-02 20:10 ` oreo639
@ 2023-04-02 20:12 ` oreo639
  2023-04-02 20:13 ` oreo639
                   ` (15 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 20:12 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493429282

Comment:
Thank you for pointing that out.
The value of `std::atomic<uint32_t>::is_always_lock_free` depends on the value of `ATOMIC_LLONG_LOCK_FREE`:
https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/include/std/atomic#L931

https://en.cppreference.com/w/c/atomic/ATOMIC_LOCK_FREE_consts

With `ATOMIC_LLONG_LOCK_FREE = 1` on armv6. (meaning "sometimes lock free" )

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (26 preceding siblings ...)
  2023-04-02 20:12 ` oreo639
@ 2023-04-02 20:13 ` oreo639
  2023-04-02 20:33 ` nekopsykose
                   ` (14 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 20:13 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493429282

Comment:
Thank you for pointing that out.
The value of `std::atomic<uint32_t>::is_always_lock_free` depends on the value of `ATOMIC_LLONG_LOCK_FREE`:
https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/include/std/atomic#L931

https://en.cppreference.com/w/c/atomic/ATOMIC_LOCK_FREE_consts

With `ATOMIC_LLONG_LOCK_FREE = 1` on armv6. (meaning "sometimes lock free" )
https://stackoverflow.com/a/64253858

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (27 preceding siblings ...)
  2023-04-02 20:13 ` oreo639
@ 2023-04-02 20:33 ` nekopsykose
  2023-04-02 20:34 ` nekopsykose
                   ` (13 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: nekopsykose @ 2023-04-02 20:33 UTC (permalink / raw)
  To: ml

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

New comment by nekopsykose on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493434120

Comment:
that is a fault of the default armv6 arch. in void, it's defined as: https://github.com/void-linux/void-packages/blob/3641d47af71bb988a92d50b016116f91f0455133/srcpkgs/gcc/template#LL203  (which is just 'armv6'):  

```
$ echo | gcc -march=armv6 -dM -E - | grep LLONG
#define __GCC_ATOMIC_LLONG_LOCK_FREE 1
```

if you pick a newer v6 micro, like `armv6zk` (which is what the rpi0 is, and what alpine does, for instance):  

```
$ echo | gcc -march=armv6zk -dM -E - | grep LLONG
#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
```

the tl;dr of this is webkit simply cannot compile for just 'armv6' anymore, or more specifically `ANGLE` cannot, which is enabled by default in 2.40 (wasn't in 2.38).  

i think it is still "allowed" to disable it, so your options are:  

- raise -march on armv6 only, for this
- -DUSE_ANGLE_EGL=OFF to cmake, with all that implies



^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (28 preceding siblings ...)
  2023-04-02 20:33 ` nekopsykose
@ 2023-04-02 20:34 ` nekopsykose
  2023-04-02 20:35 ` nekopsykose
                   ` (12 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: nekopsykose @ 2023-04-02 20:34 UTC (permalink / raw)
  To: ml

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

New comment by nekopsykose on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493434120

Comment:
that is a fault of the default armv6 arch. in void, it's defined as: https://github.com/void-linux/void-packages/blob/3641d47af71bb988a92d50b016116f91f0455133/srcpkgs/gcc/template#LL203  (which is just 'armv6'):  

```
$ echo | gcc -march=armv6 -dM -E - | grep LLONG
#define __GCC_ATOMIC_LLONG_LOCK_FREE 1
```

if you pick a newer v6 micro, like `armv6zk` (which is what the rpi0 is, and what alpine does, for instance):  

```
$ echo | gcc -march=armv6zk -dM -E - | grep LLONG
#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
```

the tl;dr of this is webkit simply cannot compile for just 'armv6' anymore, or more specifically `ANGLE` cannot, which is enabled by default in 2.40 (wasn't in 2.38).  

i think it is still "allowed" to disable it, so your options are:  

- raise -march on armv6 only, for this
- -DUSE_ANGLE_EGL=OFF to cmake (for armv6 only, of course), with all that implies



^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (29 preceding siblings ...)
  2023-04-02 20:34 ` nekopsykose
@ 2023-04-02 20:35 ` nekopsykose
  2023-04-02 20:38 ` nekopsykose
                   ` (11 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: nekopsykose @ 2023-04-02 20:35 UTC (permalink / raw)
  To: ml

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

New comment by nekopsykose on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493434120

Comment:
that is a fault of the default armv6 arch. in void, it's defined as: https://github.com/void-linux/void-packages/blob/3641d47af71bb988a92d50b016116f91f0455133/srcpkgs/gcc/template#LL203  (which is just 'armv6'):  

```
$ echo | gcc -march=armv6 -dM -E - | grep LLONG
#define __GCC_ATOMIC_LLONG_LOCK_FREE 1
```

if you pick a newer v6 micro, like `armv6zk` (which is what the rpi0 is, and what alpine does, for instance):  

```
$ echo | gcc -march=armv6zk -dM -E - | grep LLONG
#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
```

the tl;dr of this is webkit simply cannot compile for just 'armv6' anymore, or more specifically `ANGLE` cannot, which is enabled by default in 2.40 (wasn't in 2.38).  

i think it is still "allowed" to disable it, so your options are:  

- raise -march on armv6 only, for this. i don't know which have =2 for this, except that `zk` does, you can find out the most minimal one if you pick this option and it matters to have it lower than zk
- -DUSE_ANGLE_EGL=OFF to cmake (for armv6 only, of course), with all that implies



^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (30 preceding siblings ...)
  2023-04-02 20:35 ` nekopsykose
@ 2023-04-02 20:38 ` nekopsykose
  2023-04-02 20:38 ` nekopsykose
                   ` (10 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: nekopsykose @ 2023-04-02 20:38 UTC (permalink / raw)
  To: ml

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

New comment by nekopsykose on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493434949

Comment:
ah, it's just just ANGLE_EGL- i think `ENABLE_WEBGL` also pulls angle, so you have to disable multiple things here for that one

personally, i'd probably raise the march, but i don't know what devices you support on armv6 (or if even just bare `armv6` was intentional in the first place as the default arch target, because that is very old-specced and i haven't heard of anyone use that before)

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (31 preceding siblings ...)
  2023-04-02 20:38 ` nekopsykose
@ 2023-04-02 20:38 ` nekopsykose
  2023-04-02 22:21 ` oreo639
                   ` (9 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: nekopsykose @ 2023-04-02 20:38 UTC (permalink / raw)
  To: ml

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

New comment by nekopsykose on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493434949

Comment:
ah, it's not just ANGLE_EGL- i think `ENABLE_WEBGL` also pulls angle, so you have to disable multiple things here for that one

personally, i'd probably raise the march, but i don't know what devices you support on armv6 (or if even just bare `armv6` was intentional in the first place as the default arch target, because that is very old-specced and i haven't heard of anyone use that before)

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (32 preceding siblings ...)
  2023-04-02 20:38 ` nekopsykose
@ 2023-04-02 22:21 ` oreo639
  2023-04-02 22:36 ` nekopsykose
                   ` (8 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 22:21 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493453894

Comment:
> raise -march on armv6 only, for this. i don't know which have =2 for this, except that zk does, you can find out the most minimal one if you pick this option and it matters to have it lower than zk

The most minimal is armv6k:
https://developer.arm.com/documentation/ddi0301/h/summary-of-arm1136jf-s-and-arm1176jzf-s-processor-differences/summary-of-differences/armv6k-extensions-support

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (33 preceding siblings ...)
  2023-04-02 22:21 ` oreo639
@ 2023-04-02 22:36 ` nekopsykose
  2023-04-02 23:32 ` [PR PATCH] [Updated] " oreo639
                   ` (7 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: nekopsykose @ 2023-04-02 22:36 UTC (permalink / raw)
  To: ml

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

New comment by nekopsykose on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493456445

Comment:
yeah, that looks like it works

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (34 preceding siblings ...)
  2023-04-02 22:36 ` nekopsykose
@ 2023-04-02 23:32 ` oreo639
  2023-04-02 23:33 ` oreo639
                   ` (6 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 23:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 23166 bytes --]

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

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 ----------
 srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++
 srcpkgs/webkit2gtk/template                   | 54 +++++++++++--------
 9 files changed, 62 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch

diff --git a/common/shlibs b/common/shlibs
index ddd0a3266a36..f2f392b6b45f 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1143,6 +1143,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 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,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-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/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+ 
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+-    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #ifdef __GLIBC__
++        static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #else
++        static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #endif
+ 
+     if (s_currentContext == this)
+         return true;
+-- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..e3c63b2e1ad3 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -109,6 +109,14 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)
+		# Disable ANGLE on armv6 for now.
+		# Requires support for lock-free atomics (armv6k+).
+		configure_args+=" -DENABLE_WEBGL=OFF"
+		;;
+esac
+
 # extra validation
 if [ "$build_option_sampling_profiler" -a -z "$build_option_jit" ]; then
 	broken="sampling_profiler requires JIT"
@@ -185,7 +193,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +213,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +227,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +246,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 adeb969e10c2c520c15aacea273eef5257b1f242 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 2/7] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From 9585cb69d29da47b14cb6acb0c824671b2c896d4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 3/7] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f2f392b6b45f..4af39bae735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From 60dc8b010bf25e0ca6c4232aed8c36bcf2dd340f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 4/7] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From 9cbc9e795fc11963801c53c5791e98fdec2607b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 5/7] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From 3e7a7bed194ff988f02802ced0107cfdfa46f1c6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 6/7] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a92360e98674..264943b2328b 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=2
+version=44.1
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -10,23 +10,18 @@ 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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From 2fa6457e6d3dde45a277bc2bb86ad075840b768d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 30 Mar 2023 15:42:50 -0700
Subject: [PATCH 7/7] Komikku: rebuild for libwebkitgtk60

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fad699b5d4ac..ceb56424353c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=1.17.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
@@ -9,7 +9,7 @@ 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-rarfile
- python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60
  python3-piexif"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (35 preceding siblings ...)
  2023-04-02 23:32 ` [PR PATCH] [Updated] " oreo639
@ 2023-04-02 23:33 ` oreo639
  2023-04-02 23:33 ` oreo639
                   ` (5 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 23:33 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493467937

Comment:
Discussed it on IRC, disabling ANGLE/WEBGL for now on armv6 as the people needing it is probably limited.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (36 preceding siblings ...)
  2023-04-02 23:33 ` oreo639
@ 2023-04-02 23:33 ` oreo639
  2023-04-02 23:34 ` oreo639
                   ` (4 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 23:33 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493467937

Comment:
Discussed it on IRC, disabling ANGLE/WEBGL for now on armv6 as the number of people needing it is probably limited.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (37 preceding siblings ...)
  2023-04-02 23:33 ` oreo639
@ 2023-04-02 23:34 ` oreo639
  2023-04-02 23:34 ` oreo639
                   ` (3 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 23:34 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493467937

Comment:
Discussed it on IRC, disabling ANGLE and WEBGL for now on armv6 as the number of people needing it is probably limited.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (38 preceding siblings ...)
  2023-04-02 23:34 ` oreo639
@ 2023-04-02 23:34 ` oreo639
  2023-04-03  2:26 ` [PR PATCH] [Updated] " oreo639
                   ` (2 subsequent siblings)
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-02 23:34 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41698#issuecomment-1493467937

Comment:
Discussed it on IRC, disabling ANGLE and WEBGL for now on armv6 as the number of people needing it on armv6 is probably limited.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (39 preceding siblings ...)
  2023-04-02 23:34 ` oreo639
@ 2023-04-03  2:26 ` oreo639
  2023-04-03  9:09 ` oreo639
  2023-04-03 18:07 ` [PR PATCH] [Merged]: " paper42
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-03  2:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 23166 bytes --]

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

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 ----------
 srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++
 srcpkgs/webkit2gtk/template                   | 54 +++++++++++--------
 9 files changed, 62 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch

diff --git a/common/shlibs b/common/shlibs
index ddd0a3266a36..f2f392b6b45f 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1143,6 +1143,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 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,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-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/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+ 
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+-    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #ifdef __GLIBC__
++        static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #else
++        static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #endif
+ 
+     if (s_currentContext == this)
+         return true;
+-- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..e3c63b2e1ad3 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -109,6 +109,14 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)
+		# Disable ANGLE on armv6 for now.
+		# Requires support for lock-free atomics (armv6k+).
+		configure_args+=" -DENABLE_WEBGL=OFF"
+		;;
+esac
+
 # extra validation
 if [ "$build_option_sampling_profiler" -a -z "$build_option_jit" ]; then
 	broken="sampling_profiler requires JIT"
@@ -185,7 +193,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +213,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +227,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +246,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 e9f269ac2ea74778368766f6dbb3143dd54450f3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 2/7] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From 6f8183899b073b330744781eee1adf1ad8dff72a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 3/7] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f2f392b6b45f..4af39bae735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From 18e95533caff2f46a0b9d317e8baabbbd77ee1c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 4/7] evolution-ews: update to 3.48.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From 94ec41ca7f30f6cf2d808868a571945617707e6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 5/7] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From dc4b20550e0df32fb5a614e613aea3465f23a4c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 6/7] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a92360e98674..264943b2328b 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=2
+version=44.1
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -10,23 +10,18 @@ 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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From 88d334618fa3264733e1dc955b9e9ec6d016fa6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 30 Mar 2023 15:42:50 -0700
Subject: [PATCH 7/7] Komikku: rebuild for libwebkitgtk60

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fad699b5d4ac..ceb56424353c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=1.17.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
@@ -9,7 +9,7 @@ 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-rarfile
- python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60
  python3-piexif"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (40 preceding siblings ...)
  2023-04-03  2:26 ` [PR PATCH] [Updated] " oreo639
@ 2023-04-03  9:09 ` oreo639
  2023-04-03 18:07 ` [PR PATCH] [Merged]: " paper42
  42 siblings, 0 replies; 44+ messages in thread
From: oreo639 @ 2023-04-03  9:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1294 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.40.0. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

[ci skip]

Necessary for gnome 44.

#### 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: 23750 bytes --]

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

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 +--
 .../webkit2gtk/patches/fix-cross-gir.patch    | 27 ----------
 srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++
 srcpkgs/webkit2gtk/template                   | 54 +++++++++++--------
 9 files changed, 62 insertions(+), 63 deletions(-)
 rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
 rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch

diff --git a/common/shlibs b/common/shlibs
index ddd0a3266a36..f2f392b6b45f 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.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1143,6 +1143,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 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,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-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/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp	
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+ 
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+-    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #ifdef __GLIBC__
++        static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #else
++        static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++    #endif
+ 
+     if (s_currentContext == this)
+         return true;
+-- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..e3c63b2e1ad3 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -19,25 +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"
+short_desc="GTK+3 port of the WebKit 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=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
 
@@ -109,6 +109,14 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)
+		# Disable ANGLE on armv6 for now.
+		# Requires support for lock-free atomics (armv6k+).
+		configure_args+=" -DENABLE_WEBGL=OFF"
+		;;
+esac
+
 # extra validation
 if [ "$build_option_sampling_profiler" -a -z "$build_option_jit" ]; then
 	broken="sampling_profiler requires JIT"
@@ -185,7 +193,7 @@ webkit2gtk-devel_package() {
 
 libwebkit2gtk41_package() {
 	depends="${depends}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3)"
 	pkg_install() {
 		vmove usr/bin/WebKitWebDriver
 		vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +213,7 @@ libwebkit2gtk41_package() {
 
 libwebkit2gtk41-devel_package() {
 	depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
-	short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+	short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
 	pkg_install() {
 		vmove usr/include/webkitgtk-4.1
 		vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +227,17 @@ libwebkit2gtk41-devel_package() {
 	}
 }
 
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
 	depends="${depends}"
-	short_desc="GTK4 port of the WebKit2 browser engine"
+	short_desc="GTK4 port of the WebKit 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
@@ -238,18 +246,18 @@ libwebkit2gtk50_package() {
 	}
 }
 
-libwebkit2gtk50-devel_package() {
-	depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
-	short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+	depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+	short_desc="GTK4 port of the WebKit 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 429d8881e4dd501da553a48def38e68ea321b236 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 2/7] evolution-data-server: update to 3.48.0.

---
 srcpkgs/evolution-data-server/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..a50fe74e58da 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.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -10,7 +10,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
  libgweather-devel"
 checkdepends="dbus"
@@ -18,9 +18,9 @@ short_desc="Centralized access to appointments and contacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/evolution-data-server/${version%.*}/evolution-data-server-${version}.tar.xz"
-checksum=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
 make_check=ci-skip # flaky in CI
 
 build_options="gir"

From e8f3dac76c71767ac664806b312a85704b3c0851 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 3/7] evolution: update to 3.48.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f2f392b6b45f..4af39bae735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..f271618e8976 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -18,9 +18,9 @@ short_desc="Integrated mail, addressbook and calendaring for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From ecabe8c2788fff6a6d6ba037fc12c7df27a079a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 4/7] evolution-ews: update to 3.48.0.

---
 srcpkgs/evolution-ews/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..544ec01db0ee 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services"
 maintainer="Peter Kuchar <masaj@gmx.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de

From e5c92a04331d065ffc9662f5bd4763ab61b8ea52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 5/7] gnome-initial-setup: update to 44.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 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
+version=44.0
 revision=1
 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
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff

From c7ebf43ebcc15d506f5a933b020cf7a3814e5f00 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 6/7] gnome-builder: update to 44.1.

---
 srcpkgs/gnome-builder/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a92360e98674..264943b2328b 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=2
+version=44.1
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -10,23 +10,18 @@ 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
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
 checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
 make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	LIBS="-lexecinfo"
-fi

From 40e20b56126d4c921595c44df54afebc1c495134 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 30 Mar 2023 15:42:50 -0700
Subject: [PATCH 7/7] Komikku: rebuild for libwebkitgtk60

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fad699b5d4ac..ceb56424353c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=1.17.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
@@ -9,7 +9,7 @@ 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-rarfile
- python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60
  python3-piexif"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [PR PATCH] [Merged]: webkit2gtk: update to 2.40.0. 
  2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
                   ` (41 preceding siblings ...)
  2023-04-03  9:09 ` oreo639
@ 2023-04-03 18:07 ` paper42
  42 siblings, 0 replies; 44+ messages in thread
From: paper42 @ 2023-04-03 18:07 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

webkit2gtk: update to 2.40.0. 
https://github.com/void-linux/void-packages/pull/41698

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

[ci skip]

Necessary for gnome 44.

#### 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
-->


^ permalink raw reply	[flat|nested] 44+ messages in thread

end of thread, other threads:[~2023-04-03 18:07 UTC | newest]

Thread overview: 44+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
2023-01-17 20:03 ` [PR PATCH] [Updated] " oreo639
2023-01-17 20:23 ` oreo639
2023-01-17 20:26 ` oreo639
2023-01-17 20:53 ` oreo639
2023-01-17 20:55 ` oreo639
2023-03-22  0:49 ` oreo639
2023-03-22 10:19 ` [PR PATCH] [Updated] webkit2gtk: update to 2.40.0 oreo639
2023-03-22 10:33 ` oreo639
2023-03-22 17:11 ` paper42
2023-03-22 20:48 ` [PR PATCH] [Updated] " oreo639
2023-03-22 22:44 ` oreo639
2023-03-23 17:33 ` [PR REVIEW] " paper42
2023-03-23 19:05 ` [PR PATCH] [Updated] " oreo639
2023-03-23 19:05 ` [PR REVIEW] " oreo639
2023-03-24 20:18 ` icp1994
2023-03-24 20:43 ` oreo639
2023-03-26 22:04 ` oreo639
2023-03-26 22:04 ` oreo639
2023-03-30 21:22 ` paper42
2023-03-30 22:34 ` oreo639
2023-03-30 22:54 ` [PR PATCH] [Updated] " oreo639
2023-04-01 19:48 ` oreo639
2023-04-01 19:50 ` oreo639
2023-04-02  9:04 ` paper42
2023-04-02 20:10 ` oreo639
2023-04-02 20:10 ` oreo639
2023-04-02 20:12 ` oreo639
2023-04-02 20:13 ` oreo639
2023-04-02 20:33 ` nekopsykose
2023-04-02 20:34 ` nekopsykose
2023-04-02 20:35 ` nekopsykose
2023-04-02 20:38 ` nekopsykose
2023-04-02 20:38 ` nekopsykose
2023-04-02 22:21 ` oreo639
2023-04-02 22:36 ` nekopsykose
2023-04-02 23:32 ` [PR PATCH] [Updated] " oreo639
2023-04-02 23:33 ` oreo639
2023-04-02 23:33 ` oreo639
2023-04-02 23:34 ` oreo639
2023-04-02 23:34 ` oreo639
2023-04-03  2:26 ` [PR PATCH] [Updated] " oreo639
2023-04-03  9:09 ` oreo639
2023-04-03 18:07 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).