Re: [PR PATCH] [Updated] gnome: update to 46.0.

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

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

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

https://github.com/fanyx/void-packages gnome46
https://github.com/void-linux/void-packages/pull/49428

gnome: update to 46.0.
### Missing for `gnome-core`
- [x] `gnome-control-center`
- [x] https://github.com/void-linux/void-packages/pull/49427
- [x] https://github.com/void-linux/void-packages/pull/49446
- [x] https://github.com/void-linux/void-packages/pull/49473
- [x] https://github.com/void-linux/void-packages/pull/49482
- [x] `gjs>=1.80.0`
- [x] https://github.com/void-linux/void-packages/pull/49895

### Missing for `gnome`

- [ ] `gnome-remote-desktop-46.1`
- [x] https://github.com/void-linux/void-packages/pull/49940
- [x] https://github.com/void-linux/void-packages/pull/49941
- [x] https://github.com/void-linux/void-packages/pull/49918
- [ ] https://github.com/void-linux/void-packages/pull/49945
- [x] https://github.com/void-linux/void-packages/pull/49947
- [ ] https://github.com/void-linux/void-packages/pull/49946
- [ ] https://github.com/void-linux/void-packages/pull/49957
- [x] https://github.com/void-linux/void-packages/pull/49913
- [x] https://github.com/void-linux/void-packages/pull/49916
- [x] https://github.com/void-linux/void-packages/pull/49639

@oreo639 @Gottox 

### TODO

- [x] Update `glib` and `glib-networking` dependencies to `2.80.0`

#### Testing the changes
- I tested the changes in this PR:
  - `gnome-core`: **YES**
  - `gnome`: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


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

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

From 2e05c8b395f5a0d09889db5a8cfb5f2128c291e3 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 09:57:46 +0100
Subject: [PATCH 01/21] gnome-bluetooth: update to 46.0.

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

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 3bc40264ae3d5c..fccb09af82ba5f 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=42.8
+version=46.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 changelog="https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-bluetooth/${version%.*}/gnome-bluetooth-${version}.tar.xz"
-checksum=76c241e8ca2c9b1035364535ca26084f89fc5c0e1829510f8909583115fcc2db
+checksum=13fe1e75f317acdbdf5e80c9029d2e0632d60a9ccf72a43ae36eb7545021fbef
 
 build_options="gir"
 build_options_default="gir"

From 067042d8264fa221448312e89183692cf337febd Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 12:05:56 +0100
Subject: [PATCH 02/21] gnome-initial-setup: update to 46.0.

---
 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 889647c5a61edc..279ef9f5fbb40d 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=45.4.1
+version=46.0
 revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -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=363e09aa3308e7f4074e066253a0182b322ab60376743de178bbb400e54ba8ee
+checksum=f8ee9dcea7e35e735eaa3bc8d1041d06bb64ebf1e1046e5e8e48f1fb44151847

From 4e296765d6b3771fd747b080bd297d337985d3f7 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 12:57:34 +0100
Subject: [PATCH 03/21] gnome-session: update to 46.0.

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

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 14bbbc580c3bf9..9cfaa1a07ca84f 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=45.0
+version=46.0
 revision=1
 build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
- -Dsystemduserunitdir=/usr/lib/systemd/user"
+configure_args="-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"
@@ -16,4 +15,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=706d2ffcacac38553a3c0185793f5a2b4aac940bb5e789d953c9808163bef2f1
+checksum=c6e1624af6090bc4e1a191fe2268abfa7a8de07831ca7a57f217e679bf7b9a54

From ad5652ed80ad91e81bdf301e31b5265a96822bec Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 13:26:11 +0100
Subject: [PATCH 04/21] gsettings-desktop-schemas: update to 46.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 c4fc13789417df..f4f2a5cea68d9e 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=45.0
+version=46.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=365c8d04daf79b38c8b3dc9626349a024f9e4befdd31fede74b42f7a9fbe0ae2
+checksum=493a46a1161b6388d57aa72f632a79ce96c42d5ffbd1d0b00f496ec5876f8575
 
 # Package build options
 build_options="gir"

From 7fe10e632f574d3408e0c40fbe1981749837096f Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 13:26:28 +0100
Subject: [PATCH 05/21] gnome-settings-daemon: update to 46.0.

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9e8d7eb447035e..fd2b43810628b8 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=45.1
+version=46.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -10,7 +10,8 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr4-de
  geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
- xf86-input-wacom-devel libXfixes-devel"
+ xf86-input-wacom-devel libXfixes-devel gsettings-desktop-schemas-devel
+ elogind-devel"
 depends="hicolor-icon-theme"
 checkdepends="elogind libnotify python3-dbusmock python3-gobject
  python3-pycodestyle which hwids eudev"
@@ -20,7 +21,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=c62bfec9817eee5b83ebe901a9286189a67eb5ff033c5dd41506574f822bf090
+checksum=0b9a0f64fa18a8e7e09b4c95a3f754fa033c2cdbd2dc35701f0618572c1cb3d7
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 232bbcef9e92b377e234811703d071ea42eddf01 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 13:47:30 +0100
Subject: [PATCH 06/21] mutter: update to 46.1.

---
 common/shlibs           | 10 +++++-----
 srcpkgs/mutter/template | 15 +++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61a28fdc5b7436..df47c6301f175e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2922,11 +2922,11 @@ 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-13.so.0 mutter-45.0_1
-libmutter-clutter-13.so.0 mutter-45.0_1
-libmutter-cogl-13.so.0 mutter-45.0_1
-libmutter-cogl-pango-13.so.0 mutter-45.0_1
-libmutter-mtk-13.so.0 mutter-45.0_1
+libmutter-14.so.0 mutter-46.0_1
+libmutter-clutter-14.so.0 mutter-46.0_1
+libmutter-cogl-14.so.0 mutter-46.0_1
+libmutter-cogl-pango-14.so.0 mutter-46.0_1
+libmutter-mtk-14.so.0 mutter-46.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub-0.7.so.0 libgepub-0.7.1_1
 libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 753ccfd911e205..15c4d4ce52b650 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=45.5
+version=46.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,12 +18,11 @@ short_desc="Wayland display server, X11 window manager and compositor library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-45/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=51c3324b8a975f996e5ac693ab38563c496e6f142e6cd3357b4950d250334874
-shlib_provides="libmutter-clutter-13.so libmutter-cogl-13.so
- libmutter-cogl-pango-13.so"
+checksum=63b2660dd0fa193fa662c80ee12eb8b16f2b8c3bc3896366200c79943824d51d
+shlib_provides="libmutter-clutter-14.so libmutter-cogl-14.so
+ libmutter-cogl-pango-14.so libmutter-mtk-14.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -35,8 +34,8 @@ 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-13|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-13.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-14|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-14.pc
 }
 
 mutter-devel_package() {
@@ -46,7 +45,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-13/*.gir"
+		vmove "usr/lib/mutter-14/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From ff167f1f5844e2a0e0b1d83a028d12e19d71fc53 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 13:47:41 +0100
Subject: [PATCH 07/21] gnome-shell: update to 46.1.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c833283506820c..a756c5fcfc72a4 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=45.5
-revision=2
+version=46.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false -Dtests=false"
@@ -19,10 +19,10 @@ short_desc="GNOME core user interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-45/NEWS"
 #changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/46.0/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=bd5c3d3d028d47233e4205223f0ac02ac9a973b699bc277439094d41a78d6ab0
+checksum=64f999844c101e63bf294d45b138de56319ad2f326282721aad0fa860653b369
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From d8ac8114e4edfc1e9045a669dabbff2cc656865e Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 13:57:16 +0100
Subject: [PATCH 08/21] gnome-core: update to 46.0.

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

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index b4a86610fe0332..20bf58d62bcef0 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=45.0
+version=46.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -10,28 +10,28 @@ homepage="https://www.gnome.org"
 
 depends="
  adwaita-icon-theme>=${version}
- at-spi2-core>=2.50.1
- at-spi2-atk>=2.50.1
+ at-spi2-core>=2.52.0
+ at-spi2-atk>=2.52.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
- evolution-data-server>=3.50.4
- folks>=0.15.6
+ evolution-data-server>=3.52.0
+ folks>=0.15.8
  font-adobe-source-code-pro>=2.030R
  gcr>=3.41.1
  gdm>=${version}
  geocode-glib>=3.26.4
- gjs>=1.76.0
- glib>=2.78.0
- glib-networking>=2.76.0
- gmime>=3.2.7
+ gjs>=1.80.0
+ glib>=2.80.0
+ glib-networking>=2.80.0
+ gmime>=3.2.14
  gnome-backgrounds>=${version}
- gnome-bluetooth>=42.8
+ gnome-bluetooth>=${version}
  gnome-color-manager>=3.36.0
- gnome-control-center>=${version}
+ gnome-control-center>=46.0.1
  gnome-desktop>=44.0
  gnome-initial-setup>=${version}
- gnome-keyring>=42.0
- gnome-online-accounts>=3.48.0
+ gnome-keyring>=46.1
+ gnome-online-accounts>=3.50.1
  gnome-session>=${version}
  gnome-settings-daemon>=${version}
  gnome-shell>=${version}
@@ -40,11 +40,11 @@ depends="
  gnome-user-docs>=${version}
  gnome-video-effects>=0.6.0
  gsettings-desktop-schemas>=${version}
- gvfs>=1.52.2
+ gvfs>=1.54.0
  mutter>=${version}
  nautilus>=${version}
- sushi>=${version}
- tracker>=3.6.0
+ sushi>=45.0
+ tracker>=3.7.1
  yelp>=42.2
  xdg-desktop-portal-gnome>=${version}
  zenity>=4.0.1"

From 61b4a5b65ef43175529726edc3d05c3a87b392ce Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 14:02:49 +0100
Subject: [PATCH 09/21] at-spi2-core: update to 2.52.0

---
 srcpkgs/at-spi2-core/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 794eb284022796..85ba46b8a90299 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,6 +1,6 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.50.1
+version=2.52.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,8 +12,9 @@ short_desc="Assistive Technology Service Provider Interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
+changelog="https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/at-spi2-core/${version%.*}/at-spi2-core-${version}.tar.xz"
-checksum=5727b5c0687ac57ba8040e79bd6731b714a36b8fcf32190f236b8fb3698789e7
+checksum=0ac3fc8320c8d01fa147c272ba7fa03806389c6b03d3c406d0823e30e35ff5ab
 make_check=no # non-trivial dbus setup
 
 # Package build options

From 3136acc5ef667ad591bd61a78fe4a913d5eb8e69 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 14:09:03 +0100
Subject: [PATCH 10/21] gdm: update to 46.0.

---
 .../gdm/patches/fix-service-assertions.patch  | 27 ++++++++++++++-----
 srcpkgs/gdm/patches/gcc14.patch               | 25 -----------------
 srcpkgs/gdm/template                          | 10 +++----
 3 files changed, 26 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/gdm/patches/gcc14.patch

diff --git a/srcpkgs/gdm/patches/fix-service-assertions.patch b/srcpkgs/gdm/patches/fix-service-assertions.patch
index 4460e74e31ebd4..d6458b8bde8884 100644
--- a/srcpkgs/gdm/patches/fix-service-assertions.patch
+++ b/srcpkgs/gdm/patches/fix-service-assertions.patch
@@ -1,10 +1,22 @@
-Fix systemd_dep assertions to not fail when passing a valid service directory path.
+From f51a4af51914c9b17f89ca40be54b868032c36f6 Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Wed, 20 Mar 2024 15:27:52 -0700
+Subject: [PATCH] meson: Fix systemd_dep assertions to match assertion message
+
+The assertion message suggests that it should be able to be bypassed by
+specifying a valid service directory, however that is not the case.
+
+Fix the assertions, so that they can be bypassed by specifying a valid service
+directory.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/data/meson.build b/data/meson.build
-index 2cfe4691..2211e98b 100644
+index 2cfe46918..2211e98b5 100644
 --- a/data/meson.build
 +++ b/data/meson.build
-@@ -166,20 +166,20 @@ endif
+@@ -163,20 +163,20 @@ endif
  
  systemdsystemunitdir = get_option('systemdsystemunitdir')
  if systemdsystemunitdir != 'no'
@@ -13,7 +25,7 @@ index 2cfe4691..2211e98b 100644
      systemd_systemunitdir = get_option('systemdsystemunitdir')
    else
 +    assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd system unit dir or disable it')
-     systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
+     systemd_systemunitdir = systemd_dep.get_variable(pkgconfig: 'systemdsystemunitdir')
    endif
  endif
  
@@ -24,6 +36,9 @@ index 2cfe4691..2211e98b 100644
      systemd_userunitdir = get_option('systemduserunitdir')
    else
 +    assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-     systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-                                                              define_variable: ['prefix', get_option('prefix')])
+     systemd_userunitdir = systemd_dep.get_variable(pkgconfig: 'systemduserunitdir',
+                                                    pkgconfig_define: ['prefix', get_option('prefix')])
    endif
+-- 
+GitLab
+
diff --git a/srcpkgs/gdm/patches/gcc14.patch b/srcpkgs/gdm/patches/gcc14.patch
deleted file mode 100644
index 09300f305ef9a8..00000000000000
--- a/srcpkgs/gdm/patches/gcc14.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 08ef19e848176e58511f1a66992b5a26cb3c51a2 Mon Sep 17 00:00:00 2001
-From: Alessandro Bono <alessandro.bono369@gmail.com>
-Date: Wed, 1 Nov 2023 12:35:44 +0100
-Subject: [PATCH] gdm-session: Pass the correct pointer type
-
----
- daemon/gdm-session.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index 06f648ee0..be19a049c 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -3045,7 +3045,7 @@ free_pending_worker_connection (GdmSession      *self,
-         worker_manager_interface = g_object_get_data (G_OBJECT (connection),
-                                                       "gdm-dbus-worker-manager-interface");
-         if (worker_manager_interface != NULL) {
--                g_dbus_interface_skeleton_unexport (worker_manager_interface);
-+                g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (worker_manager_interface));
-                 g_object_set_data (G_OBJECT (connection),
-                                    "gdm-dbus-worker-manager-interface",
-                                    NULL);
--- 
-GitLab
-
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 128253f83f885c..f32ae188713a94 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=45.0.1
-revision=2
+version=46.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -25,10 +25,10 @@ short_desc="GNOME Display Manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
-changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-45/NEWS"
-#changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-46/NEWS/"
 distfiles="${GNOME_SITE}/gdm/${version%%.*}/gdm-${version}.tar.xz"
-checksum=6572578c05e3c6569d6ed269f7de2aaf3a035657654586d8243907bb7a6ffa85
+checksum=8d6cb52176eca48b6bbf1cfe2fdae08d9677b5a0f2bca600dee4604de0dd1efc
 
 conf_files="
 	/etc/gdm/custom.conf

From 780a6fa020a962681aa1f7bef84a88bb4fdfce18 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 14:19:49 +0100
Subject: [PATCH 11/21] gmime: update to 3.2.14

---
 srcpkgs/gmime/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index 045e8307691bc9..c3109937798625 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -1,7 +1,7 @@
 # Template file for 'gmime'
 pkgname=gmime
-version=3.2.7
-revision=2
+version=3.2.14
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --enable-crypto $(vopt_enable vala)
@@ -14,8 +14,10 @@ short_desc="GNOME Core mime parsing library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/jstedfast/gmime"
-distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
+changelog="https://raw.githubusercontent.com/jstedfast/gmime/master/NEWS"
+#distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
+distfiles="https://github.com/jstedfast/gmime/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=a5eb3dd675f72e545c8bc1cd12107e4aad2eaec1905eb7b4013cdb1fbe5e2317
 
 build_options="gir vala"
 build_options_default="gir vala"

From 1f8393898ca448a5937855a64f50936a63d2ce01 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 14:21:05 +0100
Subject: [PATCH 12/21] gnome-backgrounds: update to 46.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 c021d48794d100..cbc68cbb225524 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=45.0
+version=46.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -11,4 +11,4 @@ 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"
 changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=cee0e688fbae5ef7a75f335ada2d10779e08ebca9445f1586de32c5a9b6dee2d
+checksum=4ddd3ac439a4a067876805921bb75f4d3c8b85a218d47c276dddde8928443c2e

From 72bde1d7f748efe139993cb43934165ed916e3b0 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 14:25:20 +0100
Subject: [PATCH 13/21] gnome-shell-extensions: update to 46.1.

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

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 35b2debe6b6bc8..15aacb47e990a0 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=45.2
+version=46.1
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -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=ee32f6387a2d18adbff7a956689bc747866b4a8712d73790c002abeae4ccaaaf
+checksum=c5ba50700da77a986f0060beedacfc017e7ec82283f2a6384842a0807bc4553f

From daf9f90f4f49280fd6ba200f587beb267c114285 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 14:26:18 +0100
Subject: [PATCH 14/21] gnome-user-docs: update to 46.1.

---
 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 1f9d4edc4fe43e..84e21cc76196f4 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=45.5
+version=46.1
 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=74167fcf42a04d9e5d3cc130d27bc203d87b685ce606a84674df24e1ff719e54
+checksum=a97293cbeeb797eb4f4d169d713bb6583bd12c3791e140283e4356d2fe180ada

From cc7e5dc427fee60aa99c916c849b9e1b616f4549 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 14:35:50 +0100
Subject: [PATCH 15/21] xdg-desktop-portal-gnome: update to 46.1.

---
 .../patches/gcc14.patch                       | 29 -------------------
 srcpkgs/xdg-desktop-portal-gnome/template     |  6 ++--
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/xdg-desktop-portal-gnome/patches/gcc14.patch

diff --git a/srcpkgs/xdg-desktop-portal-gnome/patches/gcc14.patch b/srcpkgs/xdg-desktop-portal-gnome/patches/gcc14.patch
deleted file mode 100644
index 34a43f04f96026..00000000000000
--- a/srcpkgs/xdg-desktop-portal-gnome/patches/gcc14.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5fb3c0c23ccd76c6f8239bbb66c3fb1230208d5e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tyrychtr?= <ltyrycht@redhat.com>
-Date: Mon, 11 Dec 2023 11:36:13 +0100
-Subject: [PATCH] input-capture: Pass correct pointer type to
- gtk_window_add_group
-
-It produced only a warning, but will be an error in the future.
-
-Fixes #112
----
- src/inputcapture.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/inputcapture.c b/src/inputcapture.c
-index ffa91a1d..bf60e6ea 100644
---- a/src/inputcapture.c
-+++ b/src/inputcapture.c
-@@ -409,7 +409,7 @@ create_input_capture_dialog (GDBusMethodInvocation *invocation,
-   gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- 
-   window_group = gtk_window_group_new ();
--  gtk_window_group_add_window (window_group, dialog);
-+  gtk_window_group_add_window (window_group, GTK_WINDOW (dialog));
- 
-   dialog_handle = g_new0 (InputCaptureDialogHandle, 1);
-   dialog_handle->request = g_object_ref (request);
--- 
-GitLab
-
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index c7441c6caa7464..1ba68371b23e8d 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gnome'
 pkgname=xdg-desktop-portal-gnome
-version=45.1
+version=46.1
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
@@ -14,7 +14,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/gnome-45/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/46.0/NEWS"
 distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=3e9ca821044005fb37bd68ebe4ad196fc3d072835581467a22a4879dac7b5fdd
+checksum=7e8d9623e9d96a89c0897616827cd441dcf2832927d38f135c722552b1172aa1

From d27eadb6624cf225f06c2a25127b776134ee9c41 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 21 Mar 2024 18:25:32 +0100
Subject: [PATCH 16/21] gnome-control-center: update to 46.0.1.

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 34384bcec50be4..a5d09f966a3cd8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=45.3
+version=46.0.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  pulseaudio-devel samba-devel upower-devel vala-devel
  libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel
  libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
- gsound-devel gcr-devel gnutls-devel tecla"
+ gsound-devel gcr4-devel gnutls-devel tecla"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop
  libgnomekbd ibus-gtk4"
@@ -22,9 +22,10 @@ short_desc="GNOME control center"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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-45/NEWS"
-distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=b1e949c4e86c0624ec6a6ed0df09c9fae2b22983c1dca60ed86aec8ef0b24004
+#changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-46/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%%.*}/gnome-control-center-${version}.tar.xz"
+checksum=53cfbc25156b5ca0b302531ebaeefd7f915f39b08aca143d5b0ec80855221fe4
 make_check=no # needs X11 and requires altered filesystem
 
 pre_build() {

From 1de1edeac712d257ed47f69887d54592fc37877e Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 23 Mar 2024 15:35:51 +0100
Subject: [PATCH 17/21] gnome-online-accounts: update to 3.50.1.

---
 common/shlibs                          |  2 +-
 srcpkgs/gnome-online-accounts/template | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index df47c6301f175e..0b6cdbbf8f4af3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -881,7 +881,7 @@ libp11-kit.so.0 p11-kit-0.7_1
 librest-1.0.so.0 rest-0.9.1_1
 librest-extras-1.0.so.0 rest-0.9.1_1
 libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
-libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
+libgoa-backend-1.0.so.2 gnome-online-accounts-3.50.0_1
 liboauth.so.0 liboauth-0.9.4_1
 liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 9a26f6c2252240..ba9507119dcab8 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,28 +1,30 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.48.0
+version=3.50.1
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir introspection) $(vopt_bool gir vapi)
- -Dmedia_server=true -Dman=true"
-hostmakedepends="pkg-config gettext glib-devel docbook-xsl libxslt"
-makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
- rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
+ -Dman=true"
+hostmakedepends="pkg-config gettext glib-devel docbook-xsl libxslt vala
+ gtk4-update-icon-cache"
+makedepends="gtk4-devel json-glib-devel libsecret-devel
+ rest-devel gcr4-devel mit-krb5-devel libsoup3-devel libadwaita-devel"
 depends="hicolor-icon-theme"
 short_desc="GNOME service to access online accounts"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-46/NEWS"
 distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
+checksum=42ee43fd1e2942b9ff6106252ccdc834602815508bf7a3a52c0bdfffa56eaf40
 
 build_options="gir"
 build_options_default="gir"
 
 gnome-online-accounts-devel_package() {
-	depends="gtk+3-devel ${sourcepkg}>=${version}_${revision}"
+	depends="gtk4-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 494d32e9b8b44e171d118317d6197b773f6ff3f3 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 18 Apr 2024 11:40:22 +0200
Subject: [PATCH 18/21] gjs: update to 1.80.2.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 23c7350a11aa9d..d10e449a0ab1d3 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.78.4
+version=1.80.2
 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-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-46/NEWS"
 distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=9aec7ab872c2050404907ae94f0ae7abec8a54bd9c894ddb5c2d0f51e932b9a1
+checksum=135e39c5ac591096233e557cfe577d64093f5054411d47cb2e214bad7d4199bd
 make_check_pre="xvfb-run"
 
 if [ "$XBPS_CHECK_PKGS" ]; then

From 1408731cdb9c3fdadab1acb447e2e452bf057548 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Fri, 19 Apr 2024 11:42:14 +0200
Subject: [PATCH 19/21] cinnamon-control-center: rebuild against
 gnome-online-accounts.

---
 srcpkgs/cinnamon-control-center/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 0d24f6c29e952e..ead98639c4accc 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,9 +1,10 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
 version=5.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
+configure_args="-Donlineaccounts=false"
 hostmakedepends="gettext-devel glib-devel intltool pkg-config libxslt"
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel

From a745aba74c039ab2cb3a41873333fd697741841f Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Fri, 19 Apr 2024 17:58:24 +0200
Subject: [PATCH 20/21] gnome-tweaks: update to 46.0.

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

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index 963940101ce2ac..fc492bef54fb08 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,17 +1,19 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=45.2
+version=46.0
 revision=1
 build_style=meson
-hostmakedepends="pkg-config gettext"
-makedepends="libhandy1-devel"
-depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy1"
+build_helper=gir
+hostmakedepends="pkg-config gettext desktop-file-utils gtk4-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel libadwaita-devel
+ python3-gobject-devel"
+depends="dconf gnome-settings-daemon libadwaita mutter python3-gobject"
 short_desc="GNOME tool to customize advanced options"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=01bf5e723a1d18b1025401e32b5f64eb29b79e8a17ad010bbbd1e23b137b9069
+checksum=1678786341f664ac4580784222a16409fa9bf5cc7a5f1b46dcefd2aa13ddba31
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From 177411bfac83f06c1eb116bb32b3d66a7cb05757 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 20 Apr 2024 15:27:43 +0200
Subject: [PATCH 21/21] gnome: update to 46.0.

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index b88f9b28037e15..1aa95421de0d7a 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=45.0
+version=46.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
@@ -12,7 +12,7 @@ depends="
  gnome-core>=${version}
  baobab>=${version}
  evince>=${version}
- file-roller>=43.1
+ file-roller>=44.1
  gnome-calculator>=${version}
  gnome-calendar>=${version}
  gnome-characters>=${version}
@@ -26,7 +26,7 @@ depends="
  gnome-remote-desktop>=${version}
  gnome-system-monitor>=${version}
  gnome-text-editor>=${version}
- gnome-tweaks>=42.beta
+ gnome-tweaks>=${version}
  gnome-weather>=${version}
  gsound>=1.0.3
  gspell>=1.12.2
@@ -35,18 +35,18 @@ depends="
  orca>=${version}
  phodav>=3.0
  power-profiles-daemon>=0.13
- simple-scan>=44.0
+ simple-scan>=${version}
  snapshot>=${version}
  totem>=43"
 
 _apps_depends="
  Endeavour>=43
  bijiben>=40.1
- dconf-editor>=${version}
+ dconf-editor>=45.0.1
  devhelp>=43
- eog>=${version}
+ eog>=45.3
  epiphany>=${version}
- evolution>=3.50.4
+ evolution>=3.52.0
  ghex>=${version}
  gitg>=44
  gnome-boxes>=${version}
@@ -55,11 +55,11 @@ _apps_depends="
  gnome-calendar>=${version}
  gnome-characters>=${version}
  gnome-clocks>=${version}
- gnome-connections>=44.0
+ gnome-connections>=${version}
  gnome-console>=${version}
  gnome-dictionary>=40.0
  gnome-disk-utility>=${version}
- gnome-font-viewer>=44.0
+ gnome-font-viewer>=${version}
  gnome-maps>=${version}
  gnome-music>=${version}
  gnome-nettool>=42
@@ -68,11 +68,11 @@ _apps_depends="
  gnome-sound-recorder>=42
  gnome-system-monitor>=${version}
  gnome-text-editor>=${version}
- gnome-tour>=44.0
+ gnome-tour>=${version}
  gnote>=${version}
  polari>=${version}
  rygel>=0.42.5
- simple-scan>=42
+ simple-scan>=${version}
  totem>=43.0
  vino>=3.22.0"
 
@@ -81,19 +81,19 @@ _games_collection_depends="
  five-or-more>=3.32.3
  four-in-a-row>=3.38.1
  gnome-2048>=3.38.2
- gnome-chess>=43.2
+ gnome-chess>=${version}
  gnome-klotski>=3.38.2
- gnome-mahjongg>=3.40.0
+ gnome-mahjongg>=3.40.1
  gnome-mines>=40.1
- gnome-nibbles>=3.38.3
+ gnome-nibbles>=4.0.4
  gnome-robots>=40.0
  gnome-sudoku>=${version}
  gnome-tetravex>=3.38.2
  hitori>=44.0
  iagno>=3.38.1
- lightsoff>=40.0.1
+ lightsoff>=${version}
  quadrapassel>=40.2
- swell-foop>=41.1
+ swell-foop>=${version}
  tali>=40.9"
 
 gnome-apps_package() {