Github messages for voidlinux
 help / color / mirror / Atom feed
From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] [RFC] GNOME 44
Date: Fri, 24 Mar 2023 01:53:05 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42965@inbox.vuxu.org> (raw)

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

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965

[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

This is a WIP tracking PR for GNOME 44.

Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961

Related:
+ https://github.com/void-linux/void-packages/pull/42935

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

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

From 2d64e3446a291a9fcb723563ef55d951b75b49f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/29] 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 b8d161c2d932..c5cdc607054c 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 3acfe3a95f95a8ad21bc23c838cb50583eaedd1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/29] 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 3806f174b8e7da52361fb48fb89bd059a40c420b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/29] 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 c5cdc607054c..5e6a93fc4f0f 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 0082879fb95d242f5f9615d27431078b13f2c145 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/29] 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 290f283f44bc8d4d1546f12deab693288143dfba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/29] 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 6950d76013d5d9e9cf1746a0cec6363414367fc8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/29] 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 fdd8494dc9767cd4fec1fd9ac87c5274f8b371bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/29] 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 2d2fc41ec8f238e425a3ae6d31dff524a2a7e8f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/29] 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 5a4b9e308583a9bb603058e5a6b9d97ad06eff42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/29] 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

From 8639c3fe81293b45550360ddfa20bc07aa2accd6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/29] gnome-desktop: update to 40.0.

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=43
+version=44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
-checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
 
 build_options="gir"
 build_options_default="gir"

From ccf4d05a3d6accaf2cb0667459313216ec564f32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/29] gnome-session: update to 40.0.

---
 srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
 srcpkgs/gnome-session/template                     |  7 ++++---
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch

diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
- 
-   # Check for systemd
-   if enable_systemd
--    systemd_dep = dependency('systemd', version: '>= 242', required: true)
--    systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
--                                                             define_variable: ['prefix', prefix])
--
-+    systemd_userunitdir = '/tmp'
-     libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
-     session_bin_deps += libsystemd_dep
- 
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=43.0
+version=44.0
 revision=1
 build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
 hostmakedepends="glib-devel gettext pkg-config xmlto"
 makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel
  libglib-devel libICE-devel libSM-devel xtrans"
@@ -15,4 +16,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6

From d4c824a67c73ee7d55f88830596dc23ae787a4c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/29] mutter: update to 40.0.

---
 common/shlibs           |  8 ++++----
 srcpkgs/mutter/template | 23 ++++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-11.so.0 mutter-43.2_1
-libmutter-clutter-11.so.0 mutter-43.2_1
-libmutter-cogl-11.so.0 mutter-43.2_1
-libmutter-cogl-pango-11.so.0 mutter-43.2_1
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub-0.6.so.0 libgepub-0.6.0_4
 libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=43.3
+version=44.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
  xorg-server-xwayland"
 makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
  json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
  wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
 short_desc="Wayland display server, X11 window manager and compositor library"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ pre_build() {
 post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
-	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-11|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
 }
 
 mutter-devel_package() {
-	depends="gtk+3-devel graphene-devel clutter-devel
+	depends="gtk4-devel graphene-devel clutter-devel
 	 libX11-devel libXtst-devel mutter-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-11/*.gir"
+		vmove "usr/lib/mutter-12/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 4f717337c36f1ec8f8ccf370fa90052a608e9f2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/29] gnome-shell: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=43.3
+version=44.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From c9010dcea3b31ae398a5f649a23fdba9507fa8d9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/29] gdm: update to 44.0.

---
 srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
 srcpkgs/gdm/template                         |  4 ++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
-   libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+   libwrap_dep = cc.find_library('wrap')
  endif
  # systemd
 -systemd_dep = dependency('systemd')
  libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
--  systemd_multiseat_x = find_program('systemd-multi-seat-x',
--    required: false,
--    dirs: [
--      systemd_dep.get_pkgconfig_variable('systemdutildir'),
--      '/lib/systemd',
--      '/usr/lib/systemd',
--    ])
--else
--  systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+-  required: false,
+-  dirs: [
+-    systemd_dep.get_pkgconfig_variable('systemdutildir'),
+-    '/lib/systemd',
+-    '/usr/lib/systemd',
+-  ])
 +systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
  systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
  # Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=43.0
+version=44.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
 
 conf_files="
 	/etc/gdm/custom.conf

From 8a58dcacc278a74c9cbd2cfb5a0f3086e4102516 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/29] gnome-shell-extensions: update to 44.0.

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

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
 depends="gnome-shell>=${version} nautilus unzip"
 short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab

From ae6b087a883c34aa79cb1fc0edb6e21750ee0710 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/29] gjs: update to 1.76.0.

---
 ...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
 .../gjs/patches/ignore-encoding-test.patch    |  8 +--
 srcpkgs/gjs/template                          |  6 +--
 3 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch

diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
+-- 
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
 broken on musl
 --- a/installed-tests/js/meson.build
 --- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
      'Console',
      'ESModules',
+     'AsyncMainloop',
 -    'Encoding',
      'GLibLogWriter',
- ]
- if build_cairo
+     'Global',
+     'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.74.1
+version=1.76.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 #changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
 make_check_pre="xvfb-run"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 7c7e5189129fb196b129219e185f337cf21ddb86 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/29] gsettings-desktop-schemas: update to 44.0.

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

diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=43.0
+version=44.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
 
 # Package build options
 build_options="gir"

From 402169684ad450edfc170e1f360aad35778dec16 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/29] gnome-settings-daemon: update to 44.0.

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From fa099bc7009a7208b20d63f78f23a2176b04f8e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/29] gnome-control-center: update to 44.0.

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
-changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
 make_check=no # needs X11 and requires altered filesystem
 
 pre_build() {

From fd8b6269f9b11724e383a117c7b5c5feeaca3d09 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/29] gnome-backgrounds: update to 44.0.

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

diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..96fe282d0195 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=43
+version=44.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e

From c124c5144ef060e2b75a094bbee5d7c8b3cb71d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/29] gnome-user-docs: update to 44.0.

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

diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=43.0
+version=44.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
-checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd

From 9ecc92ae02637035fdd7a084ce38089e26cbf617 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:33:41 -0700
Subject: [PATCH 22/29] tracker: update to 3.5.0.

---
 srcpkgs/tracker/patches/disable-cli-test.patch | 14 +++++++-------
 srcpkgs/tracker/template                       |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
index 7b3f90302925..98db4cbf3fe9 100644
--- a/srcpkgs/tracker/patches/disable-cli-test.patch
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -1,11 +1,11 @@
 fails to create database and then times out at creating a http server
 --- a/tests/functional-tests/meson.build
 +++ b/tests/functional-tests/meson.build
-@@ -35,7 +35,6 @@ functional_tests = [
-   'collation',
-   'ontology-changes',
-   'ontology-rollback',
--  'cli',
-   'portal',
- ]
+@@ -18,7 +18,6 @@ testconf.set('TEST_TAP_ENABLED', get_opt
+ subdir('config')
  
+ functional_tests = [
+-  'test_cli',
+   'test_coalesce',
+   'test_collation',
+   'test_concurrent_query',
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..16f14211f4b5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=3.4.2
+version=3.5.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Tracker"
 changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731
+checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
 make_check_pre="dbus-run-session"
 
 if [ "$CROSS_BUILD" ]; then

From cbae9e6d6ce3b10f242627cbcdc02aa583b3cc0c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:34:00 -0700
Subject: [PATCH 23/29] tracker-miners: update to 3.5.0.

---
 srcpkgs/tracker-miners/patches/build.patch | 25 ----------------------
 srcpkgs/tracker-miners/template            |  4 ++--
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/tracker-miners/patches/build.patch

diff --git a/srcpkgs/tracker-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
deleted file mode 100644
index 9fd55b1d6324..000000000000
--- a/srcpkgs/tracker-miners/patches/build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 23:57:32 +0200
-Subject: [PATCH] fix build
-
----
- src/libtracker-miner/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build
-index a226623..9eacee3 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -40,7 +40,7 @@ endif
- 
- libtracker_miner = library(
-     'tracker-miner-' + tracker_api_version,
--    miner_enums[0], miner_enums[1], miner_sources,
-+    miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources,
-     c_args: tracker_c_args,
-     install: true,
-     install_dir: tracker_internal_libs_dir,
--- 
-2.28.0
-
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..09af42dbc977 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
-version=3.4.3
+version=3.5.0
 revision=1
 build_style=meson
 build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
 homepage="https://tracker.gnome.org/"
 changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8e4f3976472641b648d0f8f20debae1b1629ca5b560b8616e117d29d756fbeeb
+checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3
 make_check=no # relies on unsupported ops in chroot
 
 tracker3-miners_package() {

From 4252db900ba390fae1051c06dde8c4398f62a8c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 24/29] xdg-desktop-portal-gnome: update to 44.0.

---
 srcpkgs/xdg-desktop-portal-gnome/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 4f0ea1e9b00a..4fdb2688117f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'xdg-desktop-portal-gnome'
 pkgname=xdg-desktop-portal-gnome
-version=43.1
-revision=2
+version=44.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
 hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -13,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34

From 3c83ff4a86ddb2de47baaa932f96f51c40df03cd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 25/29] gnome-online-accounts: update to 3.48.0.

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

diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
 
 build_options="gir"
 build_options_default="gir"

From ac3090665049ea201b9f4e9e8712826f07cefee2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 26/29] gvfs: update to 1.50.4.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.50.2
+version=1.50.4
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From eef6dfd39e332f35bd181760e97b13c78641775d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 27/29] zenity: update to 3.44.0.

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

diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
 # Template file for 'zenity'
 pkgname=zenity
-version=3.43.0
+version=3.44.0
 revision=1
 build_style=meson
 configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ license="LGPL-2.0-or-later"
 homepage="https://help.gnome.org/users/zenity/"
 changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
 
 build_options="webkit"
 build_options_default="webkit"

From 85bea39a4c77f6aedefadd53a0d542baea9959b6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 28/29] glib-networking: update to 2.76.0.

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.74.0
+version=2.76.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
 lib32disabled=yes

From 0f4fc7e0a030120f1903f237e02bb08c3431c280 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 29/29] gnome-core: update to 44.0.

---
 srcpkgs/gnome-core/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=43.0
+version=44.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
  folks>=0.15.5
  font-adobe-source-code-pro>=2.030R
  gcr>=3.41.0
  gdm>=${version}
  geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
  gmime>=3.2.7
  gnome-backgrounds>=${version}
  gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
  gnome-desktop>=${version}
  gnome-initial-setup>=${version}
  gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
  gnome-session>=${version}
  gnome-settings-daemon>=${version}
  gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
  mutter>=${version}
  nautilus>=${version}
  sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
  xdg-desktop-portal-gnome>=${version}
  zenity>=3.${version}"

             reply	other threads:[~2023-03-24  0:53 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-24  0:53 oreo639 [this message]
2023-03-24  0:55 ` [PR PATCH] [Updated] " oreo639
2023-03-24 10:41 ` oreo639
2023-03-26  9:45 ` [PR REVIEW] " paper42
2023-03-26  9:45 ` paper42
2023-03-26 10:39 ` [PR PATCH] [Updated] " oreo639
2023-03-26 10:40 ` [PR REVIEW] " oreo639
2023-03-26 20:25 ` [PR PATCH] [Updated] " oreo639
2023-03-26 21:35 ` oreo639
2023-03-26 21:38 ` oreo639
2023-03-26 23:24 ` oreo639
2023-03-27 23:07 ` oreo639
2023-03-27 23:11 ` oreo639
2023-03-30 23:00 ` oreo639
2023-04-03  8:45 ` oreo639
2023-04-03  8:47 ` oreo639
2023-04-03 19:18 ` oreo639
2023-04-03 19:25 ` oreo639
2023-04-07 20:38 ` oreo639
2023-04-07 20:54 ` oreo639
2023-04-07 20:56 ` oreo639
2023-04-07 22:54 ` oreo639
2023-04-28 21:19 ` oreo639
2023-06-08  8:41 ` oreo639
2023-06-08  9:12 ` oreo639
2023-06-18 13:27 ` paper42
2023-06-18 18:23 ` [PR PATCH] [Merged]: " paper42

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42965@inbox.vuxu.org \
    --to=oreo639@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).