Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [RFC] GNOME 42
@ 2022-03-24  1:01 oreo639
  2022-03-24  1:02 ` abenson
                   ` (281 more replies)
  0 siblings, 282 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  1:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gnome42
https://github.com/void-linux/void-packages/pull/36311

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

#### Testing the changes
- I tested the changes in this PR: **briefly**
- 
Depends on: https://github.com/void-linux/void-packages/pull/36241

Things blocking libsoup3:
+ gnome-online-accounts
+ evolution-data-server

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36311.patch is attached

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

From aba55512994968bffcfb15717efcbf404b1ab3f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:09 -0700
Subject: [PATCH 01/52] xdg-desktop-portal: update to 1.14.1

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..5d9fb873dfe6 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false"
 hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
  libportal-devel"
 checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec
 
 do_check() {
 	# some tests require a dbus session

From 1f91fa7f882b3f142b70d1153c9e027a98d01d45 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 02/52] xdg-desktop-portal-gtk: update to 1.14.0

---
 srcpkgs/xdg-desktop-portal-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..597f5977cabf 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gtk'
 pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
 
 post_install() {
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From d5628e5ff76714567ac51c06b93b98644f84084e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:49 -0700
Subject: [PATCH 03/52] xdg-desktop-portal-kde: update to 5.24.3

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 10169eb0f394..23aaba046f68 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ea5ba329468449640f8bfb2ab4c92daf2b214826 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 04/52] New package: xdg-desktop-portal-gnome-42.0.1

---
 srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..b7951deec327
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,20 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.0.1
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/tmp"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+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"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 9adee4b423b48f10180a36c4382b52556723f758 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 05/52] adwaita-icon-theme: update to 42.0

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0

From 09a20032e5b736ac1692df3a484f6a4f3ba5afc4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 06/52] at-spi2-core: update to 2.44.0

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..898d62a5e843 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.42.0
+version=2.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
 
 # Package build options
 build_options="gir"

From c031609764ec4a984bcf19286b9790c5e9161926 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 07/52] baobab: update to 42.0

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc

From 025861edcd5287d15e99bef17346b0b56ebb6f51 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:34 -0700
Subject: [PATCH 08/52] colord-gtk: 0.3.0

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

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..87cd02b712f2 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
@@ -9,13 +9,13 @@ configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
 build_options_default="vala"

From 60b4bb6706ad317b0ac40618b5b1a2abc09afe99 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 09/52] eog: update to 42.0

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..46220222bbc7 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,20 @@
 # Template file for 'eog'
 pkgname=eog
-version=41.1
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From f502b3f3801f4f22a22b0d07dd72deca6668f1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 10/52] eog-plugins: update to 42.0

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..3eca07a155c8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.8
+version=42.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+makedepends="eog-devel libhandy1-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
 depends="eog gsettings-desktop-schemas python3-gobject"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa
 python_version=3
 lib32disabled=yes

From d05e117f846f8141be68abac071f788c6f7de239 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:39:43 -0700
Subject: [PATCH 11/52] gfbgraph: update to 0.2.5

---
 srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
 srcpkgs/gfbgraph/template                |  8 +---
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch

diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build                   | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build               | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+   'libportal',
+   required: true,
++  version: '>= 0.5',
+   fallback: ['libportal', 'libportal_dep'],
+   default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+ 
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ 
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+   dependencies: [
+     dep_gtk,
+     dep_libportal,
++    dep_libportal_gtk3,
+     dep_lm
+   ],
+   install: true,
+-- 
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..844c47bed55d 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
 
 build_options="gir"
 build_options_default="gir"
@@ -27,10 +27,6 @@ do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }

From 698325b3e6f4dbb0c674ac0bdc66fb12c6bd8fb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:40:26 -0700
Subject: [PATCH 12/52] gjs: update to 1.72.0

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index b028c09437bb..7111cbbac913 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.70.1
+version=1.72.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f
+checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -35,7 +35,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da8ae7f52252f539bf1d07bb2397eba18d4fba3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 13/52] libgweather: update to 4.0.0

---
 common/shlibs                | 2 +-
 srcpkgs/libgweather/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..c967eeb38ca6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,7 +1126,7 @@ libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..429efd165b71 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,10 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"
@@ -13,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
 
 build_options="gir"
 build_options_default="gir"
@@ -21,7 +22,7 @@ build_options_default="gir"
 post_patch() {
 	# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
 	# And looks like we didn't ship it.
-	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
 }
 
 libgweather-devel_package() {

From 50fe1f4dac1efc0d7753b46eb1a1e917d16f2625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 14/52] gnome-bluetooth: update to 42.0

---
 common/shlibs                    | 1 +
 srcpkgs/gnome-bluetooth/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c967eeb38ca6..3193a11d63c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -684,6 +684,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1
 libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..35f65d377d78 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.5
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
 checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170
 
 build_options="gir"
 build_options_default="gir"

From e2d7433980ae929f5850e750e574f2a8fce60e9f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 15/52] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 3193a11d63c9..6e8ed86203a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3126,7 +3126,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From 858bf0146575594c7bd91b4958a227361995befc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 16/52] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 6e8ed86203a6..7cb67e0274e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 740ee4286c2272bf9febd8ffd79b97730bfe161c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 17/52] gcr: update to 3.41.0

---
 srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
 srcpkgs/gcr/template                         |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch

diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..2dd2a492430b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.40.0
+version=3.41.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
  libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
  $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme gnupg2"
 short_desc="GNOME crypto package"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From a9540e88b3c8779ceed233cd9506324346648259 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:54:25 -0700
Subject: [PATCH 18/52] glib-networking: update to 2.72.0

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..1893bd8eec6a 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
 make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 

From 516e3e08d4e60adf97e63645dc1b880cdd304411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:05 -0700
Subject: [PATCH 19/52] glib: update to 2.72.0

---
 .../glib/patches/disable-broken-tests.patch   | 79 -----------------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  4 +-
 3 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index c6bb8d96fadf..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
--  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..327b3231ca62 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From c919d5d886343bfc14c831f3e72734be6dcf0fbc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 20/52] gnome-autoar: update to 0.4.3

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

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
 
 build_options="gir"
 build_options_default="gir"

From 8ee8aaecb34e2597896694d0f2b8c6fbb8369a50 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 21/52] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d

From bbe8e45ae58b2a16836994a6461d4ac77dc412c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 22/52] gsettings-desktop-schemas: update to 42.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 3d841c45f8a8..52b4efeb1f80 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=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
 
 # Package build options
 build_options="gir"

From 7e69008f624655227d1451f5228095a131ea53c7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:11 -0700
Subject: [PATCH 23/52] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From f3f6f2bc0f2f74d846b4aa2bb73aed839c1494b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:44 -0700
Subject: [PATCH 24/52] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..e9985c260866 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen) $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
@@ -47,7 +47,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 609757662dec7cb5083cb2705439fab55a821ded Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:01:29 -0700
Subject: [PATCH 25/52] libsoup3: update to 3.0.5

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

diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template
index 61ed3d167f17..d0a352b7fd83 100644
--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@@ -1,6 +1,6 @@
 # Template file for 'libsoup3'
 pkgname=libsoup3
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc="libsoup-$version"
 build_style=meson
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
-checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b
+checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145
 make_check=no # gio tests can't run in chroot
 
 # Package build options

From 605de517fadaf3098aa0b18f00f42af7a81098b9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:03:46 -0700
Subject: [PATCH 26/52] libnma: enable gtk4

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

diff --git a/common/shlibs b/common/shlibs
index 7cb67e0274e1..56e886400c5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.34_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..dc9436742db3 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.34
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"

From c34199ccb51d62fbb659a361263db2a3fa4eedda Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:53:28 -0700
Subject: [PATCH 27/52] upower: update to 0.99.17

---
 srcpkgs/upower/template | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..34db34d424f9 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 08918f7eea896172ea7ef05d5f9cc7f294353707 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 28/52] yelp: update to 42.0

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..0800ea745b22 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=41.2
+version=42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,14 +15,13 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=20882556a9c5dbd3075930245e70371c6bac30eaa7a5ed09c7db127cda2013f7
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}
 }

From 337118c28883b9d00246fda84b0f025e23a689bc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 29/52] gnome-settings-daemon: update to 42.1

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9f8c9857eec6..d04f0b038033 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=41.0
+version=42.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 4cf4371758c8b70e59663616cb6de16748e1e759 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 30/52] gnome-control-center: update to 42.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..8be9bc1356c8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
@@ -12,10 +11,10 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
@@ -24,10 +23,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-
-build_options="cheese"
-build_options_default="cheese"
+checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
 
 desc_option_cheese="Add support for adding user account images with your webcam"
 

From fdda837d237047b9246c046228ee955d6ae4b1ee Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 31/52] evolution-data-server: update to 3.44.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 71db33706047..6b1ab31baf72 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,11 +1,11 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir vala)"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
 
 build_options="gir"
 build_options_default="gir"

From f614119d63c3990760a193cf9a110ad18c5318e5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 32/52] gnome-desktop: update to 42.0

---
 common/shlibs                                 |   3 +
 .../patches/00_fix_build_gtk4.patch           | 162 ++++++++++++++++++
 .../patches/01_optional_introspection.patch   |  93 ++++++++++
 srcpkgs/gnome-desktop/patches/build.patch     |  18 --
 .../patches/optionalise-gir.patch             |  47 -----
 srcpkgs/gnome-desktop/template                |   6 +-
 6 files changed, 261 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
 create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 56e886400c5c..7974b6cdd848 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
new file mode 100644
index 000000000000..7f2176c5a1d7
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
@@ -0,0 +1,162 @@
+From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 18:07:17 -0700
+Subject: [PATCH] meson: Fix build_gtk4 option
+
+---
+ libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index e81530ed..a0fb11f8 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
+   'gnome-xkb-info.h',
+ ]
+ 
+-install_headers(libgnome_desktop_base_headers,
+-  subdir: 'gnome-desktop-4.0/libgnome-desktop'
+-)
++if get_option('build_gtk4')
++  install_headers(libgnome_desktop_base_headers,
++    subdir: 'gnome-desktop-4.0/libgnome-desktop'
++  )
+ 
+-base_deps = [
+-  gdk_pixbuf_dep,
+-  glib_dep,
+-  gio_dep,
+-  gio_unix_dep,
+-  libsystemd_dep,
+-  schemas_dep,
+-  xkb_config_dep,
+-  xkbregistry_dep,
+-  iso_codes_dep,
+-  udev_dep,
+-  seccomp_dep,
+-  m_dep,
+-  rt_dep,
+-]
++  base_deps = [
++    gdk_pixbuf_dep,
++    glib_dep,
++    gio_dep,
++    gio_unix_dep,
++    libsystemd_dep,
++    schemas_dep,
++    xkb_config_dep,
++    xkbregistry_dep,
++    iso_codes_dep,
++    udev_dep,
++    seccomp_dep,
++    m_dep,
++    rt_dep,
++  ]
+ 
+-libgnome_desktop_base = library('gnome-desktop-4',
+-  sources: [
+-    libgnome_desktop_base_sources,
+-    libgnome_desktop_base_private_sources,
+-    dbus_idle_built_sources,
+-  ],
+-  dependencies: base_deps,
+-  soversion: soversion,
+-  version: libversion,
+-  c_args: libargs,
+-  link_args: base_ldflags,
+-  install: true,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base = library('gnome-desktop-4',
++    sources: [
++      libgnome_desktop_base_sources,
++      libgnome_desktop_base_private_sources,
++      dbus_idle_built_sources,
++    ],
++    dependencies: base_deps,
++    soversion: soversion,
++    version: libversion,
++    c_args: libargs,
++    link_args: base_ldflags,
++    install: true,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-  export_packages: 'gnome-desktop-4',
+-  namespace: 'GnomeDesktop',
+-  nsversion: '4.0',
+-  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-  identifier_prefix: 'Gnome',
+-  symbol_prefix: 'gnome',
+-  install: true,
+-)
++  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++    export_packages: 'gnome-desktop-4',
++    namespace: 'GnomeDesktop',
++    nsversion: '4.0',
++    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++    identifier_prefix: 'Gnome',
++    symbol_prefix: 'gnome',
++    install: true,
++  )
+ 
+-pkg.generate(
+-  libgnome_desktop_base,
+-  requires: ['gsettings-desktop-schemas'],
+-  version: meson.project_version(),
+-  name: 'gnome-desktop-4',
+-  filebase: 'gnome-desktop-4',
+-  description: 'Utility library for GNOME desktop components',
+-  subdirs: 'gnome-desktop-4.0',
+-)
++  pkg.generate(
++    libgnome_desktop_base,
++    requires: ['gsettings-desktop-schemas'],
++    version: meson.project_version(),
++    name: 'gnome-desktop-4',
++    filebase: 'gnome-desktop-4',
++    description: 'Utility library for GNOME desktop components',
++    subdirs: 'gnome-desktop-4.0',
++  )
+ 
+-libgnome_desktop_base_dep = declare_dependency(
+-  sources: [
+-    libgnome_desktop_base_gir,
+-  ],
+-  dependencies: base_deps,
+-  link_with: libgnome_desktop_base,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base_dep = declare_dependency(
++    sources: [
++      libgnome_desktop_base_gir,
++    ],
++    dependencies: base_deps,
++    link_with: libgnome_desktop_base,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-if gtk4_dep.found()
+   subdir('gnome-bg')
+   subdir('gnome-rr')
+ endif
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt            |  4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+     ],
+   )
+ 
+-  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-    export_packages: 'gnome-desktop-4',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '4.0',
+-    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true,
+-  )
++  if get_option('introspection')
++    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++      export_packages: 'gnome-desktop-4',
++      namespace: 'GnomeDesktop',
++      nsversion: '4.0',
++      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true,
++    )
++  endif
+ 
+   pkg.generate(
+     libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+     ],
+   )
+ 
+-  gnome.generate_gir(libgnome_desktop,
+-    sources: introspection_sources + libgnome_desktop_headers,
+-    export_packages: 'gnome-desktop-3.0',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '3.0',
+-    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true
+-  )
++  if get_option('introspection')
++    gnome.generate_gir(libgnome_desktop,
++      sources: introspection_sources + libgnome_desktop_headers,
++      export_packages: 'gnome-desktop-3.0',
++      namespace: 'GnomeDesktop',
++      nsversion: '3.0',
++      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true
++    )
++  endif
+ 
+   pkg.generate(
+     libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+   type: 'boolean', value: true, description: 'Build debug tools'
+ )
+ 
++option('introspection',
++  type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+   type: 'feature', description: 'Udev support'
+ )
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Wed Aug 12 05:26:00 2020 +0200
-
-    bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
- 
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
- 
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
--gnome.generate_gir(libgnome_desktop,
--  sources: introspection_sources + libgnome_desktop_headers,
--  export_packages: 'gnome-desktop-3.0',
--  namespace: 'GnomeDesktop',
--  nsversion: '3.0',
--  includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--  extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true
--)
-+if get_option('introspection')
-+  gnome.generate_gir(libgnome_desktop,
-+    sources: introspection_sources + libgnome_desktop_headers,
-+    export_packages: 'gnome-desktop-3.0',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '3.0',
-+    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+    extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true
-+  )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
-   type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+  type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..6c90cfd62663 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
  iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
  libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
 depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
+checksum=f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6
 make_check=no # needs X
 
 build_options="gir"

From 24f52ab1b3868d83e9c3dddfe75b7ccfd4078c4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:15:30 -0700
Subject: [PATCH 33/52] colord-gtk: update to 0.3.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 7974b6cdd848..497a53036e99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1137,6 +1137,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1

From 3c1a0ed6cc0dd4a8d500a0e3536959639f63a081 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 34/52] gnome-session: update to 42.0

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

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..21e3840e3e4e 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 47e433c215c82dbf5944a94fb25316a8ac938e31 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:13 -0700
Subject: [PATCH 35/52] gnome-shell: update to 42.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..8175828a8043 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,6 +10,7 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 6db13fb5de7fc656cfa3265bc8a018d2e1f6ae4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 36/52] gnome-shell-extensions: update to 42.0

---
 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 3f4be3c068de..33d6bf649b44 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=41.2
+version=42.0
 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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f

From 36f5312f659a40b520a5bfd96f29c2a79260f4cd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:21:44 -0700
Subject: [PATCH 37/52] mutter: update to 42.0

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

diff --git a/common/shlibs b/common/shlibs
index 497a53036e99..24ebdfd9a4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2983,10 +2983,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-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..a1aaef3cd47b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,9 +20,9 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ 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-9|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 
 mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-9/*.gir"
+		vmove "usr/lib/mutter-10/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 3e6d77635e3e728d05ef3585e86813072b001ab1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:22:28 -0700
Subject: [PATCH 38/52] gdm: update to 42.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..d302b7e0f1f5 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ configure_args="
 hostmakedepends="dconf gettext itstool pkg-config"
 makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
  iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
 depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
 
 conf_files="
 	/etc/gdm/custom.conf

From c58335fcbd6e12d916c55588d8648e80fbcae0c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:24:40 -0700
Subject: [PATCH 39/52] libportal: update to 0.6

---
 common/shlibs              |  4 +++-
 srcpkgs/libportal/template | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 24ebdfd9a4f7..597102cca2fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3933,7 +3933,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
 libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-0.6_1
+libportal-gtk4.so.1 libportal-0.6_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..2eceb1f4cd64 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,19 +1,21 @@
 # Template file for 'libportal'
 pkgname=libportal
-version=0.4
+version=0.6
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool vala vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if vala vala)
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
 short_desc="Flatpak portal library"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/flatpak/libportal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
 
-build_options="gtk_doc"
+build_options="vala gtk_doc"
+build_options_default="vala gtk_doc"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gtk_doc"
@@ -27,7 +29,10 @@ libportal-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }

From a17a338640ce5f026efafeded20fb8bea3b64251 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:25:18 -0700
Subject: [PATCH 40/52] gcolor3: rebuild against libportal 0.6

---
 srcpkgs/gcolor3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..03ec72506db0 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,7 +1,7 @@
 # Template file for 'gcolor3'
 pkgname=gcolor3
 version=2.4.0
-revision=1
+revision=2
 wrksrc="gcolor3-v${version}"
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"

From 6fae632ce4ed3e799770c13ec9a32c5d357c9d70 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 41/52] nautilus: update to 42.0

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..66a6765f7bd1 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+checksum=3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 0f1dc533a0f251b93fa954e20e658b434bf0d043 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:44 -0700
Subject: [PATCH 42/52] tracker3: update to 3.3.0

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

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 3ae12716faa5..d1e383150f6d 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3'
 pkgname=tracker3
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-${version}
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://live.gnome.org/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"

From 5c255c37cc79ae89bf15a9e42aaa6294e85a5bc1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:27:10 -0700
Subject: [PATCH 43/52] tracker3-miners: update to 3.3.0

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index adc11e7970c1..2660322eaf67 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
@@ -26,7 +26,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
+checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
 
 # relies on unsupported ops in chroot
 do_check() {

From b3791c2d6fe221b5f17d3d1a4cd11070fa0e5359 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 44/52] epiphany: update to 42.0

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..f58f33639b37 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3

From 5264f1a2e5ea7eaedde28daf57339a732560b2a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 45/52] gnome-initial-setup: update to 42.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 6e7931930878..f63ece2484f6 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=41.4
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,7 +10,7 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-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
- pango-devel"
+ pango-devel libhandy1-devel"
 depends="iso-codes"
 short_desc="GNOME initial setup"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+checksum=cbf3e386d2acb5f4ecbb118ffb703da12901e84b80c244749428101eac47eaa7

From 98078f144e43f5659811491aa4e0b281bd57e884 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 46/52] gnome-clocks: update to 42.0

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..2afb26fe0735 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
 makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Clock application for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0

From 9cf95cdfba3e4d0c16337ac24fa651d37f0d78bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 47/52] gnome-calendar: update to 42.0

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..15d466f885a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,19 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel
+ libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa
 
 build_options="gir"
 build_options_default="gir"

From 199027d0e7a942be57e22a1b484e325ddb64eaec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 48/52] gnome-builder: update to 42.0

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..03057a6adfe3 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper=qemu
@@ -18,9 +18,9 @@ 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-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=52efd296d68b2ff182341c0481dcfd70654c408bdb679fceb76db9703c22428f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 9c258be7c60dc126d5d94bde0970bdeb8ae6c4d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:33:30 -0700
Subject: [PATCH 49/52] gnome-todo: rebuild against libportal 0.6

---
 srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
 srcpkgs/gnome-todo/template                 |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json          | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build             | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+         {
+             "name" : "libportal",
+             "buildsystem" : "meson",
++            "config-opts" : [
++                "-Dbackends=gtk4"
++            ],
+             "sources" : [
+                 {
+                     "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+ 
+ #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+ 
+ plugins_deps += [
+-  dependency('libportal'),
++  dependency('libportal-gtk4'),
+ ]
+ 
+ plugins_sources += files(
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..56713aec4a4c 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=41.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 6a060adb7faca01e17a24fba2e283680646100d0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 50/52] gnome-weather: update to 42.0

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

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
 lib32disabled=yes

From 5b2d9f6b32d3f6724cf0ade2b960581a8286de5d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 51/52] gnome-user-docs: update to 42.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 579bb4f407f0..773c9913d74f 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=41.2
+version=42.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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905

From 2f83f4f2b1f6ad39cc8ae116815873b8d8eb548d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 52/52] gnome-core: update to 42.0

---
 srcpkgs/gnome-core/template | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..9d5a23f20f55 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=41.0
+version=42.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -9,44 +9,45 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=42.0
+ at-spi2-core>=2.44.0
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
  evolution-data-server>=3.42.0
- folks>=0.14.0
+ folks>=0.15.4
  font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=42.0
  geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
  gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-backgrounds>=42.0
+ gnome-bluetooth>=42.0
  gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=42.0
+ gnome-desktop>=42.0
+ gnome-initial-setup>=42.0
  gnome-keyring>=40.0
  gnome-online-accounts>=3.40.0
  gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
+ gnome-session>=42.0
+ gnome-settings-daemon>=42.1
+ gnome-shell>=42.0
+ gnome-shell-extensions>=42.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-user-docs>=42.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
+ gsettings-desktop-schemas>=42.0
  gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ mutter>=42.0
+ nautilus>=42.0
  sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
+ tracker3>=3.3.0
+ yelp>=42.0
+ xdg-desktop-portal-gtk>=1.14.0
+ xdg-desktop-portal-gnome>=42.0
  zenity>=3.41.0"

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

* Re: [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
@ 2022-03-24  1:02 ` abenson
  2022-03-24  1:02 ` oreo639
                   ` (280 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: abenson @ 2022-03-24  1:02 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/36311#issuecomment-1076965273

Comment:
Don't open and close PRs. Force push to the branch to rewrite it. Opening and closing just creates noise.

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

* Re: [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
  2022-03-24  1:02 ` abenson
@ 2022-03-24  1:02 ` oreo639
  2022-03-24  1:07 ` classabbyamp
                   ` (279 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  1:02 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36311#issuecomment-1076965490

Comment:
I recreated the PR since I meant for this to be a draft PR. Sorry about that.


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

* Re: [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
  2022-03-24  1:02 ` abenson
  2022-03-24  1:02 ` oreo639
@ 2022-03-24  1:07 ` classabbyamp
  2022-03-24  1:08 ` oreo639
                   ` (278 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: classabbyamp @ 2022-03-24  1:07 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36311#issuecomment-1076967681

Comment:
you can change the draft status by clicking "convert to draft" in the sidebar

![image](https://user-images.githubusercontent.com/5366828/159821845-327e9257-5720-4ff5-b654-4c27c949f0d4.png)


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

* Re: [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
                   ` (2 preceding siblings ...)
  2022-03-24  1:07 ` classabbyamp
@ 2022-03-24  1:08 ` oreo639
  2022-03-24  1:18 ` [PR PATCH] [Updated] " oreo639
                   ` (277 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  1:08 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36311#issuecomment-1076968102

Comment:
Thank you. Sorry about that.

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

* Re: [PR PATCH] [Updated] [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
                   ` (3 preceding siblings ...)
  2022-03-24  1:08 ` oreo639
@ 2022-03-24  1:18 ` oreo639
  2022-03-24  1:29 ` oreo639
                   ` (276 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  1:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gnome42
https://github.com/void-linux/void-packages/pull/36311

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

[CI Skip]

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

Depends on: https://github.com/void-linux/void-packages/pull/36241

Blocking libsoup3:
+ gnome-online-accounts
+ evolution-data-server

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36311.patch is attached

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

From aba55512994968bffcfb15717efcbf404b1ab3f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:09 -0700
Subject: [PATCH 01/53] xdg-desktop-portal: update to 1.14.1

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..5d9fb873dfe6 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false"
 hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
  libportal-devel"
 checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec
 
 do_check() {
 	# some tests require a dbus session

From 1f91fa7f882b3f142b70d1153c9e027a98d01d45 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 02/53] xdg-desktop-portal-gtk: update to 1.14.0

---
 srcpkgs/xdg-desktop-portal-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..597f5977cabf 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gtk'
 pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
 
 post_install() {
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From d5628e5ff76714567ac51c06b93b98644f84084e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:49 -0700
Subject: [PATCH 03/53] xdg-desktop-portal-kde: update to 5.24.3

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 10169eb0f394..23aaba046f68 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ea5ba329468449640f8bfb2ab4c92daf2b214826 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 04/53] New package: xdg-desktop-portal-gnome-42.0.1

---
 srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..b7951deec327
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,20 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.0.1
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/tmp"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+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"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 9adee4b423b48f10180a36c4382b52556723f758 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 05/53] adwaita-icon-theme: update to 42.0

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0

From 09a20032e5b736ac1692df3a484f6a4f3ba5afc4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 06/53] at-spi2-core: update to 2.44.0

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..898d62a5e843 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.42.0
+version=2.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
 
 # Package build options
 build_options="gir"

From c031609764ec4a984bcf19286b9790c5e9161926 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 07/53] baobab: update to 42.0

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc

From 025861edcd5287d15e99bef17346b0b56ebb6f51 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:34 -0700
Subject: [PATCH 08/53] colord-gtk: 0.3.0

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

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..87cd02b712f2 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
@@ -9,13 +9,13 @@ configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
 build_options_default="vala"

From 60b4bb6706ad317b0ac40618b5b1a2abc09afe99 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 09/53] eog: update to 42.0

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..46220222bbc7 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,20 @@
 # Template file for 'eog'
 pkgname=eog
-version=41.1
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From f502b3f3801f4f22a22b0d07dd72deca6668f1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 10/53] eog-plugins: update to 42.0

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..3eca07a155c8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.8
+version=42.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+makedepends="eog-devel libhandy1-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
 depends="eog gsettings-desktop-schemas python3-gobject"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa
 python_version=3
 lib32disabled=yes

From d05e117f846f8141be68abac071f788c6f7de239 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:39:43 -0700
Subject: [PATCH 11/53] gfbgraph: update to 0.2.5

---
 srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
 srcpkgs/gfbgraph/template                |  8 +---
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch

diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build                   | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build               | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+   'libportal',
+   required: true,
++  version: '>= 0.5',
+   fallback: ['libportal', 'libportal_dep'],
+   default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+ 
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ 
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+   dependencies: [
+     dep_gtk,
+     dep_libportal,
++    dep_libportal_gtk3,
+     dep_lm
+   ],
+   install: true,
+-- 
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..844c47bed55d 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
 
 build_options="gir"
 build_options_default="gir"
@@ -27,10 +27,6 @@ do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }

From 698325b3e6f4dbb0c674ac0bdc66fb12c6bd8fb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:40:26 -0700
Subject: [PATCH 12/53] gjs: update to 1.72.0

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index b028c09437bb..7111cbbac913 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.70.1
+version=1.72.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f
+checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -35,7 +35,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da8ae7f52252f539bf1d07bb2397eba18d4fba3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 13/53] libgweather: update to 4.0.0

---
 common/shlibs                | 2 +-
 srcpkgs/libgweather/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..c967eeb38ca6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,7 +1126,7 @@ libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..429efd165b71 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,10 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"
@@ -13,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
 
 build_options="gir"
 build_options_default="gir"
@@ -21,7 +22,7 @@ build_options_default="gir"
 post_patch() {
 	# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
 	# And looks like we didn't ship it.
-	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
 }
 
 libgweather-devel_package() {

From 50fe1f4dac1efc0d7753b46eb1a1e917d16f2625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 14/53] gnome-bluetooth: update to 42.0

---
 common/shlibs                    | 1 +
 srcpkgs/gnome-bluetooth/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c967eeb38ca6..3193a11d63c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -684,6 +684,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1
 libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..35f65d377d78 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.5
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
 checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170
 
 build_options="gir"
 build_options_default="gir"

From e2d7433980ae929f5850e750e574f2a8fce60e9f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 15/53] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 3193a11d63c9..6e8ed86203a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3126,7 +3126,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From 858bf0146575594c7bd91b4958a227361995befc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 16/53] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 6e8ed86203a6..7cb67e0274e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 740ee4286c2272bf9febd8ffd79b97730bfe161c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 17/53] gcr: update to 3.41.0

---
 srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
 srcpkgs/gcr/template                         |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch

diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..2dd2a492430b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.40.0
+version=3.41.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
  libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
  $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme gnupg2"
 short_desc="GNOME crypto package"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From a9540e88b3c8779ceed233cd9506324346648259 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:54:25 -0700
Subject: [PATCH 18/53] glib-networking: update to 2.72.0

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..1893bd8eec6a 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
 make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 

From 516e3e08d4e60adf97e63645dc1b880cdd304411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:05 -0700
Subject: [PATCH 19/53] glib: update to 2.72.0

---
 .../glib/patches/disable-broken-tests.patch   | 79 -----------------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  4 +-
 3 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index c6bb8d96fadf..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
--  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..327b3231ca62 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From c919d5d886343bfc14c831f3e72734be6dcf0fbc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 20/53] gnome-autoar: update to 0.4.3

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

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
 
 build_options="gir"
 build_options_default="gir"

From 8ee8aaecb34e2597896694d0f2b8c6fbb8369a50 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 21/53] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d

From bbe8e45ae58b2a16836994a6461d4ac77dc412c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 22/53] gsettings-desktop-schemas: update to 42.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 3d841c45f8a8..52b4efeb1f80 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=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
 
 # Package build options
 build_options="gir"

From 7e69008f624655227d1451f5228095a131ea53c7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:11 -0700
Subject: [PATCH 23/53] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From f3f6f2bc0f2f74d846b4aa2bb73aed839c1494b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:44 -0700
Subject: [PATCH 24/53] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..e9985c260866 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen) $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
@@ -47,7 +47,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 609757662dec7cb5083cb2705439fab55a821ded Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:01:29 -0700
Subject: [PATCH 25/53] libsoup3: update to 3.0.5

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

diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template
index 61ed3d167f17..d0a352b7fd83 100644
--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@@ -1,6 +1,6 @@
 # Template file for 'libsoup3'
 pkgname=libsoup3
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc="libsoup-$version"
 build_style=meson
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
-checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b
+checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145
 make_check=no # gio tests can't run in chroot
 
 # Package build options

From 605de517fadaf3098aa0b18f00f42af7a81098b9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:03:46 -0700
Subject: [PATCH 26/53] libnma: enable gtk4

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

diff --git a/common/shlibs b/common/shlibs
index 7cb67e0274e1..56e886400c5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.34_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..dc9436742db3 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.34
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"

From c34199ccb51d62fbb659a361263db2a3fa4eedda Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:53:28 -0700
Subject: [PATCH 27/53] upower: update to 0.99.17

---
 srcpkgs/upower/template | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..34db34d424f9 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 08918f7eea896172ea7ef05d5f9cc7f294353707 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 28/53] yelp: update to 42.0

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..0800ea745b22 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=41.2
+version=42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,14 +15,13 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=20882556a9c5dbd3075930245e70371c6bac30eaa7a5ed09c7db127cda2013f7
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}
 }

From 337118c28883b9d00246fda84b0f025e23a689bc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 29/53] gnome-settings-daemon: update to 42.1

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9f8c9857eec6..d04f0b038033 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=41.0
+version=42.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 4cf4371758c8b70e59663616cb6de16748e1e759 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 30/53] gnome-control-center: update to 42.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..8be9bc1356c8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
@@ -12,10 +11,10 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
@@ -24,10 +23,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-
-build_options="cheese"
-build_options_default="cheese"
+checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
 
 desc_option_cheese="Add support for adding user account images with your webcam"
 

From fdda837d237047b9246c046228ee955d6ae4b1ee Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 31/53] evolution-data-server: update to 3.44.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 71db33706047..6b1ab31baf72 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,11 +1,11 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir vala)"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
 
 build_options="gir"
 build_options_default="gir"

From f614119d63c3990760a193cf9a110ad18c5318e5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 32/53] gnome-desktop: update to 42.0

---
 common/shlibs                                 |   3 +
 .../patches/00_fix_build_gtk4.patch           | 162 ++++++++++++++++++
 .../patches/01_optional_introspection.patch   |  93 ++++++++++
 srcpkgs/gnome-desktop/patches/build.patch     |  18 --
 .../patches/optionalise-gir.patch             |  47 -----
 srcpkgs/gnome-desktop/template                |   6 +-
 6 files changed, 261 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
 create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 56e886400c5c..7974b6cdd848 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
new file mode 100644
index 000000000000..7f2176c5a1d7
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
@@ -0,0 +1,162 @@
+From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 18:07:17 -0700
+Subject: [PATCH] meson: Fix build_gtk4 option
+
+---
+ libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index e81530ed..a0fb11f8 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
+   'gnome-xkb-info.h',
+ ]
+ 
+-install_headers(libgnome_desktop_base_headers,
+-  subdir: 'gnome-desktop-4.0/libgnome-desktop'
+-)
++if get_option('build_gtk4')
++  install_headers(libgnome_desktop_base_headers,
++    subdir: 'gnome-desktop-4.0/libgnome-desktop'
++  )
+ 
+-base_deps = [
+-  gdk_pixbuf_dep,
+-  glib_dep,
+-  gio_dep,
+-  gio_unix_dep,
+-  libsystemd_dep,
+-  schemas_dep,
+-  xkb_config_dep,
+-  xkbregistry_dep,
+-  iso_codes_dep,
+-  udev_dep,
+-  seccomp_dep,
+-  m_dep,
+-  rt_dep,
+-]
++  base_deps = [
++    gdk_pixbuf_dep,
++    glib_dep,
++    gio_dep,
++    gio_unix_dep,
++    libsystemd_dep,
++    schemas_dep,
++    xkb_config_dep,
++    xkbregistry_dep,
++    iso_codes_dep,
++    udev_dep,
++    seccomp_dep,
++    m_dep,
++    rt_dep,
++  ]
+ 
+-libgnome_desktop_base = library('gnome-desktop-4',
+-  sources: [
+-    libgnome_desktop_base_sources,
+-    libgnome_desktop_base_private_sources,
+-    dbus_idle_built_sources,
+-  ],
+-  dependencies: base_deps,
+-  soversion: soversion,
+-  version: libversion,
+-  c_args: libargs,
+-  link_args: base_ldflags,
+-  install: true,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base = library('gnome-desktop-4',
++    sources: [
++      libgnome_desktop_base_sources,
++      libgnome_desktop_base_private_sources,
++      dbus_idle_built_sources,
++    ],
++    dependencies: base_deps,
++    soversion: soversion,
++    version: libversion,
++    c_args: libargs,
++    link_args: base_ldflags,
++    install: true,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-  export_packages: 'gnome-desktop-4',
+-  namespace: 'GnomeDesktop',
+-  nsversion: '4.0',
+-  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-  identifier_prefix: 'Gnome',
+-  symbol_prefix: 'gnome',
+-  install: true,
+-)
++  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++    export_packages: 'gnome-desktop-4',
++    namespace: 'GnomeDesktop',
++    nsversion: '4.0',
++    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++    identifier_prefix: 'Gnome',
++    symbol_prefix: 'gnome',
++    install: true,
++  )
+ 
+-pkg.generate(
+-  libgnome_desktop_base,
+-  requires: ['gsettings-desktop-schemas'],
+-  version: meson.project_version(),
+-  name: 'gnome-desktop-4',
+-  filebase: 'gnome-desktop-4',
+-  description: 'Utility library for GNOME desktop components',
+-  subdirs: 'gnome-desktop-4.0',
+-)
++  pkg.generate(
++    libgnome_desktop_base,
++    requires: ['gsettings-desktop-schemas'],
++    version: meson.project_version(),
++    name: 'gnome-desktop-4',
++    filebase: 'gnome-desktop-4',
++    description: 'Utility library for GNOME desktop components',
++    subdirs: 'gnome-desktop-4.0',
++  )
+ 
+-libgnome_desktop_base_dep = declare_dependency(
+-  sources: [
+-    libgnome_desktop_base_gir,
+-  ],
+-  dependencies: base_deps,
+-  link_with: libgnome_desktop_base,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base_dep = declare_dependency(
++    sources: [
++      libgnome_desktop_base_gir,
++    ],
++    dependencies: base_deps,
++    link_with: libgnome_desktop_base,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-if gtk4_dep.found()
+   subdir('gnome-bg')
+   subdir('gnome-rr')
+ endif
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt            |  4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+     ],
+   )
+ 
+-  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-    export_packages: 'gnome-desktop-4',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '4.0',
+-    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true,
+-  )
++  if get_option('introspection')
++    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++      export_packages: 'gnome-desktop-4',
++      namespace: 'GnomeDesktop',
++      nsversion: '4.0',
++      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true,
++    )
++  endif
+ 
+   pkg.generate(
+     libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+     ],
+   )
+ 
+-  gnome.generate_gir(libgnome_desktop,
+-    sources: introspection_sources + libgnome_desktop_headers,
+-    export_packages: 'gnome-desktop-3.0',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '3.0',
+-    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true
+-  )
++  if get_option('introspection')
++    gnome.generate_gir(libgnome_desktop,
++      sources: introspection_sources + libgnome_desktop_headers,
++      export_packages: 'gnome-desktop-3.0',
++      namespace: 'GnomeDesktop',
++      nsversion: '3.0',
++      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true
++    )
++  endif
+ 
+   pkg.generate(
+     libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+   type: 'boolean', value: true, description: 'Build debug tools'
+ )
+ 
++option('introspection',
++  type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+   type: 'feature', description: 'Udev support'
+ )
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Wed Aug 12 05:26:00 2020 +0200
-
-    bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
- 
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
- 
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
--gnome.generate_gir(libgnome_desktop,
--  sources: introspection_sources + libgnome_desktop_headers,
--  export_packages: 'gnome-desktop-3.0',
--  namespace: 'GnomeDesktop',
--  nsversion: '3.0',
--  includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--  extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true
--)
-+if get_option('introspection')
-+  gnome.generate_gir(libgnome_desktop,
-+    sources: introspection_sources + libgnome_desktop_headers,
-+    export_packages: 'gnome-desktop-3.0',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '3.0',
-+    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+    extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true
-+  )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
-   type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+  type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..6c90cfd62663 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
  iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
  libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
 depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
+checksum=f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6
 make_check=no # needs X
 
 build_options="gir"

From 24f52ab1b3868d83e9c3dddfe75b7ccfd4078c4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:15:30 -0700
Subject: [PATCH 33/53] colord-gtk: update to 0.3.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 7974b6cdd848..497a53036e99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1137,6 +1137,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1

From 3c1a0ed6cc0dd4a8d500a0e3536959639f63a081 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 34/53] gnome-session: update to 42.0

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

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..21e3840e3e4e 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 47e433c215c82dbf5944a94fb25316a8ac938e31 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:13 -0700
Subject: [PATCH 35/53] gnome-shell: update to 42.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..8175828a8043 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,6 +10,7 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 6db13fb5de7fc656cfa3265bc8a018d2e1f6ae4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 36/53] gnome-shell-extensions: update to 42.0

---
 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 3f4be3c068de..33d6bf649b44 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=41.2
+version=42.0
 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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f

From 36f5312f659a40b520a5bfd96f29c2a79260f4cd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:21:44 -0700
Subject: [PATCH 37/53] mutter: update to 42.0

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

diff --git a/common/shlibs b/common/shlibs
index 497a53036e99..24ebdfd9a4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2983,10 +2983,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-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..a1aaef3cd47b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,9 +20,9 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ 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-9|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 
 mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-9/*.gir"
+		vmove "usr/lib/mutter-10/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 3e6d77635e3e728d05ef3585e86813072b001ab1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:22:28 -0700
Subject: [PATCH 38/53] gdm: update to 42.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..d302b7e0f1f5 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ configure_args="
 hostmakedepends="dconf gettext itstool pkg-config"
 makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
  iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
 depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
 
 conf_files="
 	/etc/gdm/custom.conf

From c58335fcbd6e12d916c55588d8648e80fbcae0c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:24:40 -0700
Subject: [PATCH 39/53] libportal: update to 0.6

---
 common/shlibs              |  4 +++-
 srcpkgs/libportal/template | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 24ebdfd9a4f7..597102cca2fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3933,7 +3933,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
 libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-0.6_1
+libportal-gtk4.so.1 libportal-0.6_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..2eceb1f4cd64 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,19 +1,21 @@
 # Template file for 'libportal'
 pkgname=libportal
-version=0.4
+version=0.6
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool vala vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if vala vala)
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
 short_desc="Flatpak portal library"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/flatpak/libportal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
 
-build_options="gtk_doc"
+build_options="vala gtk_doc"
+build_options_default="vala gtk_doc"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gtk_doc"
@@ -27,7 +29,10 @@ libportal-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }

From a17a338640ce5f026efafeded20fb8bea3b64251 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:25:18 -0700
Subject: [PATCH 40/53] gcolor3: rebuild against libportal 0.6

---
 srcpkgs/gcolor3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..03ec72506db0 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,7 +1,7 @@
 # Template file for 'gcolor3'
 pkgname=gcolor3
 version=2.4.0
-revision=1
+revision=2
 wrksrc="gcolor3-v${version}"
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"

From 6fae632ce4ed3e799770c13ec9a32c5d357c9d70 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 41/53] nautilus: update to 42.0

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..66a6765f7bd1 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+checksum=3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 0f1dc533a0f251b93fa954e20e658b434bf0d043 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:44 -0700
Subject: [PATCH 42/53] tracker3: update to 3.3.0

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

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 3ae12716faa5..d1e383150f6d 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3'
 pkgname=tracker3
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-${version}
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://live.gnome.org/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"

From 5c255c37cc79ae89bf15a9e42aaa6294e85a5bc1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:27:10 -0700
Subject: [PATCH 43/53] tracker3-miners: update to 3.3.0

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index adc11e7970c1..2660322eaf67 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
@@ -26,7 +26,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
+checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
 
 # relies on unsupported ops in chroot
 do_check() {

From b3791c2d6fe221b5f17d3d1a4cd11070fa0e5359 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 44/53] epiphany: update to 42.0

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..f58f33639b37 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3

From 5264f1a2e5ea7eaedde28daf57339a732560b2a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 45/53] gnome-initial-setup: update to 42.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 6e7931930878..f63ece2484f6 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=41.4
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,7 +10,7 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-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
- pango-devel"
+ pango-devel libhandy1-devel"
 depends="iso-codes"
 short_desc="GNOME initial setup"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+checksum=cbf3e386d2acb5f4ecbb118ffb703da12901e84b80c244749428101eac47eaa7

From 98078f144e43f5659811491aa4e0b281bd57e884 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 46/53] gnome-clocks: update to 42.0

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..2afb26fe0735 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
 makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Clock application for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0

From 9cf95cdfba3e4d0c16337ac24fa651d37f0d78bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 47/53] gnome-calendar: update to 42.0

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..15d466f885a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,19 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel
+ libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa
 
 build_options="gir"
 build_options_default="gir"

From 199027d0e7a942be57e22a1b484e325ddb64eaec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 48/53] gnome-builder: update to 42.0

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..03057a6adfe3 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper=qemu
@@ -18,9 +18,9 @@ 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-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=52efd296d68b2ff182341c0481dcfd70654c408bdb679fceb76db9703c22428f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 9c258be7c60dc126d5d94bde0970bdeb8ae6c4d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:33:30 -0700
Subject: [PATCH 49/53] gnome-todo: rebuild against libportal 0.6

---
 srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
 srcpkgs/gnome-todo/template                 |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json          | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build             | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+         {
+             "name" : "libportal",
+             "buildsystem" : "meson",
++            "config-opts" : [
++                "-Dbackends=gtk4"
++            ],
+             "sources" : [
+                 {
+                     "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+ 
+ #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+ 
+ plugins_deps += [
+-  dependency('libportal'),
++  dependency('libportal-gtk4'),
+ ]
+ 
+ plugins_sources += files(
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..56713aec4a4c 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=41.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 6a060adb7faca01e17a24fba2e283680646100d0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 50/53] gnome-weather: update to 42.0

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

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
 lib32disabled=yes

From 5b2d9f6b32d3f6724cf0ade2b960581a8286de5d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 51/53] gnome-user-docs: update to 42.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 579bb4f407f0..773c9913d74f 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=41.2
+version=42.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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905

From 2f83f4f2b1f6ad39cc8ae116815873b8d8eb548d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 52/53] gnome-core: update to 42.0

---
 srcpkgs/gnome-core/template | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..9d5a23f20f55 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=41.0
+version=42.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -9,44 +9,45 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=42.0
+ at-spi2-core>=2.44.0
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
  evolution-data-server>=3.42.0
- folks>=0.14.0
+ folks>=0.15.4
  font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=42.0
  geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
  gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-backgrounds>=42.0
+ gnome-bluetooth>=42.0
  gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=42.0
+ gnome-desktop>=42.0
+ gnome-initial-setup>=42.0
  gnome-keyring>=40.0
  gnome-online-accounts>=3.40.0
  gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
+ gnome-session>=42.0
+ gnome-settings-daemon>=42.1
+ gnome-shell>=42.0
+ gnome-shell-extensions>=42.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-user-docs>=42.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
+ gsettings-desktop-schemas>=42.0
  gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ mutter>=42.0
+ nautilus>=42.0
  sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
+ tracker3>=3.3.0
+ yelp>=42.0
+ xdg-desktop-portal-gtk>=1.14.0
+ xdg-desktop-portal-gnome>=42.0
  zenity>=3.41.0"

From 678528eb5fb33d93b7737d478d62a1f1d0605d7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:01 -0700
Subject: [PATCH 53/53] gnome-terminal: update to 3.43.90

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 4853fb46511a..e48dcd8a4117 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.42.2
+version=3.43.90
 revision=1
 build_style=meson
 configure_args="-Dnautilus_extension=true -Db_ndebug=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0
+checksum=a50a723a874d364a0fefc19f994d885545aa60a51d6818a62ff90f82ff53c9d6
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

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

* Re: [PR PATCH] [Updated] [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
                   ` (4 preceding siblings ...)
  2022-03-24  1:18 ` [PR PATCH] [Updated] " oreo639
@ 2022-03-24  1:29 ` oreo639
  2022-03-24  1:37 ` oreo639
                   ` (275 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  1:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gnome42
https://github.com/void-linux/void-packages/pull/36311

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

[CI Skip]

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

Depends on: https://github.com/void-linux/void-packages/pull/36241

Blocking libsoup3:
+ gnome-online-accounts
+ evolution-data-server

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36311.patch is attached

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

From aba55512994968bffcfb15717efcbf404b1ab3f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:09 -0700
Subject: [PATCH 01/55] xdg-desktop-portal: update to 1.14.1

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..5d9fb873dfe6 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false"
 hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
  libportal-devel"
 checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec
 
 do_check() {
 	# some tests require a dbus session

From 1f91fa7f882b3f142b70d1153c9e027a98d01d45 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 02/55] xdg-desktop-portal-gtk: update to 1.14.0

---
 srcpkgs/xdg-desktop-portal-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..597f5977cabf 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gtk'
 pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
 
 post_install() {
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From d5628e5ff76714567ac51c06b93b98644f84084e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:49 -0700
Subject: [PATCH 03/55] xdg-desktop-portal-kde: update to 5.24.3

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 10169eb0f394..23aaba046f68 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ea5ba329468449640f8bfb2ab4c92daf2b214826 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 04/55] New package: xdg-desktop-portal-gnome-42.0.1

---
 srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..b7951deec327
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,20 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.0.1
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/tmp"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+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"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 9adee4b423b48f10180a36c4382b52556723f758 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 05/55] adwaita-icon-theme: update to 42.0

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0

From 09a20032e5b736ac1692df3a484f6a4f3ba5afc4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 06/55] at-spi2-core: update to 2.44.0

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..898d62a5e843 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.42.0
+version=2.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
 
 # Package build options
 build_options="gir"

From c031609764ec4a984bcf19286b9790c5e9161926 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 07/55] baobab: update to 42.0

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc

From 025861edcd5287d15e99bef17346b0b56ebb6f51 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:34 -0700
Subject: [PATCH 08/55] colord-gtk: 0.3.0

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

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..87cd02b712f2 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
@@ -9,13 +9,13 @@ configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
 build_options_default="vala"

From 60b4bb6706ad317b0ac40618b5b1a2abc09afe99 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 09/55] eog: update to 42.0

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..46220222bbc7 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,20 @@
 # Template file for 'eog'
 pkgname=eog
-version=41.1
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From f502b3f3801f4f22a22b0d07dd72deca6668f1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 10/55] eog-plugins: update to 42.0

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..3eca07a155c8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.8
+version=42.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+makedepends="eog-devel libhandy1-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
 depends="eog gsettings-desktop-schemas python3-gobject"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa
 python_version=3
 lib32disabled=yes

From d05e117f846f8141be68abac071f788c6f7de239 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:39:43 -0700
Subject: [PATCH 11/55] gfbgraph: update to 0.2.5

---
 srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
 srcpkgs/gfbgraph/template                |  8 +---
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch

diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build                   | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build               | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+   'libportal',
+   required: true,
++  version: '>= 0.5',
+   fallback: ['libportal', 'libportal_dep'],
+   default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+ 
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ 
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+   dependencies: [
+     dep_gtk,
+     dep_libportal,
++    dep_libportal_gtk3,
+     dep_lm
+   ],
+   install: true,
+-- 
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..844c47bed55d 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
 
 build_options="gir"
 build_options_default="gir"
@@ -27,10 +27,6 @@ do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }

From 698325b3e6f4dbb0c674ac0bdc66fb12c6bd8fb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:40:26 -0700
Subject: [PATCH 12/55] gjs: update to 1.72.0

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index b028c09437bb..7111cbbac913 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.70.1
+version=1.72.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f
+checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -35,7 +35,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da8ae7f52252f539bf1d07bb2397eba18d4fba3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 13/55] libgweather: update to 4.0.0

---
 common/shlibs                | 2 +-
 srcpkgs/libgweather/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..c967eeb38ca6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,7 +1126,7 @@ libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..429efd165b71 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,10 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"
@@ -13,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
 
 build_options="gir"
 build_options_default="gir"
@@ -21,7 +22,7 @@ build_options_default="gir"
 post_patch() {
 	# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
 	# And looks like we didn't ship it.
-	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
 }
 
 libgweather-devel_package() {

From 50fe1f4dac1efc0d7753b46eb1a1e917d16f2625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 14/55] gnome-bluetooth: update to 42.0

---
 common/shlibs                    | 1 +
 srcpkgs/gnome-bluetooth/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c967eeb38ca6..3193a11d63c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -684,6 +684,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1
 libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..35f65d377d78 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.5
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
 checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170
 
 build_options="gir"
 build_options_default="gir"

From e2d7433980ae929f5850e750e574f2a8fce60e9f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 15/55] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 3193a11d63c9..6e8ed86203a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3126,7 +3126,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From 858bf0146575594c7bd91b4958a227361995befc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 16/55] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 6e8ed86203a6..7cb67e0274e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 740ee4286c2272bf9febd8ffd79b97730bfe161c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 17/55] gcr: update to 3.41.0

---
 srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
 srcpkgs/gcr/template                         |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch

diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..2dd2a492430b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.40.0
+version=3.41.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
  libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
  $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme gnupg2"
 short_desc="GNOME crypto package"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From a9540e88b3c8779ceed233cd9506324346648259 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:54:25 -0700
Subject: [PATCH 18/55] glib-networking: update to 2.72.0

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..1893bd8eec6a 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
 make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 

From 516e3e08d4e60adf97e63645dc1b880cdd304411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:05 -0700
Subject: [PATCH 19/55] glib: update to 2.72.0

---
 .../glib/patches/disable-broken-tests.patch   | 79 -----------------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  4 +-
 3 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index c6bb8d96fadf..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
--  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..327b3231ca62 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From c919d5d886343bfc14c831f3e72734be6dcf0fbc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 20/55] gnome-autoar: update to 0.4.3

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

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
 
 build_options="gir"
 build_options_default="gir"

From 8ee8aaecb34e2597896694d0f2b8c6fbb8369a50 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 21/55] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d

From bbe8e45ae58b2a16836994a6461d4ac77dc412c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 22/55] gsettings-desktop-schemas: update to 42.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 3d841c45f8a8..52b4efeb1f80 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=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
 
 # Package build options
 build_options="gir"

From 7e69008f624655227d1451f5228095a131ea53c7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:11 -0700
Subject: [PATCH 23/55] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From f3f6f2bc0f2f74d846b4aa2bb73aed839c1494b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:44 -0700
Subject: [PATCH 24/55] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..e9985c260866 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen) $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
@@ -47,7 +47,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 609757662dec7cb5083cb2705439fab55a821ded Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:01:29 -0700
Subject: [PATCH 25/55] libsoup3: update to 3.0.5

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

diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template
index 61ed3d167f17..d0a352b7fd83 100644
--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@@ -1,6 +1,6 @@
 # Template file for 'libsoup3'
 pkgname=libsoup3
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc="libsoup-$version"
 build_style=meson
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
-checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b
+checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145
 make_check=no # gio tests can't run in chroot
 
 # Package build options

From 605de517fadaf3098aa0b18f00f42af7a81098b9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:03:46 -0700
Subject: [PATCH 26/55] libnma: enable gtk4

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

diff --git a/common/shlibs b/common/shlibs
index 7cb67e0274e1..56e886400c5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.34_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..dc9436742db3 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.34
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"

From c34199ccb51d62fbb659a361263db2a3fa4eedda Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:53:28 -0700
Subject: [PATCH 27/55] upower: update to 0.99.17

---
 srcpkgs/upower/template | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..34db34d424f9 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 08918f7eea896172ea7ef05d5f9cc7f294353707 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 28/55] yelp: update to 42.0

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..0800ea745b22 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=41.2
+version=42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,14 +15,13 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=20882556a9c5dbd3075930245e70371c6bac30eaa7a5ed09c7db127cda2013f7
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}
 }

From 337118c28883b9d00246fda84b0f025e23a689bc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 29/55] gnome-settings-daemon: update to 42.1

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9f8c9857eec6..d04f0b038033 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=41.0
+version=42.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 4cf4371758c8b70e59663616cb6de16748e1e759 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 30/55] gnome-control-center: update to 42.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..8be9bc1356c8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
@@ -12,10 +11,10 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
@@ -24,10 +23,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-
-build_options="cheese"
-build_options_default="cheese"
+checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
 
 desc_option_cheese="Add support for adding user account images with your webcam"
 

From fdda837d237047b9246c046228ee955d6ae4b1ee Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 31/55] evolution-data-server: update to 3.44.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 71db33706047..6b1ab31baf72 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,11 +1,11 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir vala)"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
 
 build_options="gir"
 build_options_default="gir"

From f614119d63c3990760a193cf9a110ad18c5318e5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 32/55] gnome-desktop: update to 42.0

---
 common/shlibs                                 |   3 +
 .../patches/00_fix_build_gtk4.patch           | 162 ++++++++++++++++++
 .../patches/01_optional_introspection.patch   |  93 ++++++++++
 srcpkgs/gnome-desktop/patches/build.patch     |  18 --
 .../patches/optionalise-gir.patch             |  47 -----
 srcpkgs/gnome-desktop/template                |   6 +-
 6 files changed, 261 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
 create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 56e886400c5c..7974b6cdd848 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
new file mode 100644
index 000000000000..7f2176c5a1d7
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
@@ -0,0 +1,162 @@
+From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 18:07:17 -0700
+Subject: [PATCH] meson: Fix build_gtk4 option
+
+---
+ libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index e81530ed..a0fb11f8 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
+   'gnome-xkb-info.h',
+ ]
+ 
+-install_headers(libgnome_desktop_base_headers,
+-  subdir: 'gnome-desktop-4.0/libgnome-desktop'
+-)
++if get_option('build_gtk4')
++  install_headers(libgnome_desktop_base_headers,
++    subdir: 'gnome-desktop-4.0/libgnome-desktop'
++  )
+ 
+-base_deps = [
+-  gdk_pixbuf_dep,
+-  glib_dep,
+-  gio_dep,
+-  gio_unix_dep,
+-  libsystemd_dep,
+-  schemas_dep,
+-  xkb_config_dep,
+-  xkbregistry_dep,
+-  iso_codes_dep,
+-  udev_dep,
+-  seccomp_dep,
+-  m_dep,
+-  rt_dep,
+-]
++  base_deps = [
++    gdk_pixbuf_dep,
++    glib_dep,
++    gio_dep,
++    gio_unix_dep,
++    libsystemd_dep,
++    schemas_dep,
++    xkb_config_dep,
++    xkbregistry_dep,
++    iso_codes_dep,
++    udev_dep,
++    seccomp_dep,
++    m_dep,
++    rt_dep,
++  ]
+ 
+-libgnome_desktop_base = library('gnome-desktop-4',
+-  sources: [
+-    libgnome_desktop_base_sources,
+-    libgnome_desktop_base_private_sources,
+-    dbus_idle_built_sources,
+-  ],
+-  dependencies: base_deps,
+-  soversion: soversion,
+-  version: libversion,
+-  c_args: libargs,
+-  link_args: base_ldflags,
+-  install: true,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base = library('gnome-desktop-4',
++    sources: [
++      libgnome_desktop_base_sources,
++      libgnome_desktop_base_private_sources,
++      dbus_idle_built_sources,
++    ],
++    dependencies: base_deps,
++    soversion: soversion,
++    version: libversion,
++    c_args: libargs,
++    link_args: base_ldflags,
++    install: true,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-  export_packages: 'gnome-desktop-4',
+-  namespace: 'GnomeDesktop',
+-  nsversion: '4.0',
+-  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-  identifier_prefix: 'Gnome',
+-  symbol_prefix: 'gnome',
+-  install: true,
+-)
++  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++    export_packages: 'gnome-desktop-4',
++    namespace: 'GnomeDesktop',
++    nsversion: '4.0',
++    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++    identifier_prefix: 'Gnome',
++    symbol_prefix: 'gnome',
++    install: true,
++  )
+ 
+-pkg.generate(
+-  libgnome_desktop_base,
+-  requires: ['gsettings-desktop-schemas'],
+-  version: meson.project_version(),
+-  name: 'gnome-desktop-4',
+-  filebase: 'gnome-desktop-4',
+-  description: 'Utility library for GNOME desktop components',
+-  subdirs: 'gnome-desktop-4.0',
+-)
++  pkg.generate(
++    libgnome_desktop_base,
++    requires: ['gsettings-desktop-schemas'],
++    version: meson.project_version(),
++    name: 'gnome-desktop-4',
++    filebase: 'gnome-desktop-4',
++    description: 'Utility library for GNOME desktop components',
++    subdirs: 'gnome-desktop-4.0',
++  )
+ 
+-libgnome_desktop_base_dep = declare_dependency(
+-  sources: [
+-    libgnome_desktop_base_gir,
+-  ],
+-  dependencies: base_deps,
+-  link_with: libgnome_desktop_base,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base_dep = declare_dependency(
++    sources: [
++      libgnome_desktop_base_gir,
++    ],
++    dependencies: base_deps,
++    link_with: libgnome_desktop_base,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-if gtk4_dep.found()
+   subdir('gnome-bg')
+   subdir('gnome-rr')
+ endif
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt            |  4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+     ],
+   )
+ 
+-  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-    export_packages: 'gnome-desktop-4',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '4.0',
+-    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true,
+-  )
++  if get_option('introspection')
++    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++      export_packages: 'gnome-desktop-4',
++      namespace: 'GnomeDesktop',
++      nsversion: '4.0',
++      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true,
++    )
++  endif
+ 
+   pkg.generate(
+     libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+     ],
+   )
+ 
+-  gnome.generate_gir(libgnome_desktop,
+-    sources: introspection_sources + libgnome_desktop_headers,
+-    export_packages: 'gnome-desktop-3.0',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '3.0',
+-    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true
+-  )
++  if get_option('introspection')
++    gnome.generate_gir(libgnome_desktop,
++      sources: introspection_sources + libgnome_desktop_headers,
++      export_packages: 'gnome-desktop-3.0',
++      namespace: 'GnomeDesktop',
++      nsversion: '3.0',
++      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true
++    )
++  endif
+ 
+   pkg.generate(
+     libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+   type: 'boolean', value: true, description: 'Build debug tools'
+ )
+ 
++option('introspection',
++  type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+   type: 'feature', description: 'Udev support'
+ )
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Wed Aug 12 05:26:00 2020 +0200
-
-    bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
- 
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
- 
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
--gnome.generate_gir(libgnome_desktop,
--  sources: introspection_sources + libgnome_desktop_headers,
--  export_packages: 'gnome-desktop-3.0',
--  namespace: 'GnomeDesktop',
--  nsversion: '3.0',
--  includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--  extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true
--)
-+if get_option('introspection')
-+  gnome.generate_gir(libgnome_desktop,
-+    sources: introspection_sources + libgnome_desktop_headers,
-+    export_packages: 'gnome-desktop-3.0',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '3.0',
-+    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+    extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true
-+  )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
-   type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+  type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..6c90cfd62663 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
  iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
  libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
 depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
+checksum=f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6
 make_check=no # needs X
 
 build_options="gir"

From 24f52ab1b3868d83e9c3dddfe75b7ccfd4078c4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:15:30 -0700
Subject: [PATCH 33/55] colord-gtk: update to 0.3.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 7974b6cdd848..497a53036e99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1137,6 +1137,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1

From 3c1a0ed6cc0dd4a8d500a0e3536959639f63a081 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 34/55] gnome-session: update to 42.0

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

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..21e3840e3e4e 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 47e433c215c82dbf5944a94fb25316a8ac938e31 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:13 -0700
Subject: [PATCH 35/55] gnome-shell: update to 42.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..8175828a8043 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,6 +10,7 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 6db13fb5de7fc656cfa3265bc8a018d2e1f6ae4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 36/55] gnome-shell-extensions: update to 42.0

---
 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 3f4be3c068de..33d6bf649b44 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=41.2
+version=42.0
 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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f

From 36f5312f659a40b520a5bfd96f29c2a79260f4cd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:21:44 -0700
Subject: [PATCH 37/55] mutter: update to 42.0

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

diff --git a/common/shlibs b/common/shlibs
index 497a53036e99..24ebdfd9a4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2983,10 +2983,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-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..a1aaef3cd47b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,9 +20,9 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ 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-9|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 
 mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-9/*.gir"
+		vmove "usr/lib/mutter-10/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 3e6d77635e3e728d05ef3585e86813072b001ab1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:22:28 -0700
Subject: [PATCH 38/55] gdm: update to 42.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..d302b7e0f1f5 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ configure_args="
 hostmakedepends="dconf gettext itstool pkg-config"
 makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
  iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
 depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
 
 conf_files="
 	/etc/gdm/custom.conf

From c58335fcbd6e12d916c55588d8648e80fbcae0c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:24:40 -0700
Subject: [PATCH 39/55] libportal: update to 0.6

---
 common/shlibs              |  4 +++-
 srcpkgs/libportal/template | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 24ebdfd9a4f7..597102cca2fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3933,7 +3933,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
 libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-0.6_1
+libportal-gtk4.so.1 libportal-0.6_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..2eceb1f4cd64 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,19 +1,21 @@
 # Template file for 'libportal'
 pkgname=libportal
-version=0.4
+version=0.6
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool vala vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if vala vala)
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
 short_desc="Flatpak portal library"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/flatpak/libportal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
 
-build_options="gtk_doc"
+build_options="vala gtk_doc"
+build_options_default="vala gtk_doc"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gtk_doc"
@@ -27,7 +29,10 @@ libportal-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }

From a17a338640ce5f026efafeded20fb8bea3b64251 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:25:18 -0700
Subject: [PATCH 40/55] gcolor3: rebuild against libportal 0.6

---
 srcpkgs/gcolor3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..03ec72506db0 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,7 +1,7 @@
 # Template file for 'gcolor3'
 pkgname=gcolor3
 version=2.4.0
-revision=1
+revision=2
 wrksrc="gcolor3-v${version}"
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"

From 6fae632ce4ed3e799770c13ec9a32c5d357c9d70 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 41/55] nautilus: update to 42.0

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..66a6765f7bd1 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+checksum=3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 0f1dc533a0f251b93fa954e20e658b434bf0d043 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:44 -0700
Subject: [PATCH 42/55] tracker3: update to 3.3.0

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

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 3ae12716faa5..d1e383150f6d 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3'
 pkgname=tracker3
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-${version}
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://live.gnome.org/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"

From 5c255c37cc79ae89bf15a9e42aaa6294e85a5bc1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:27:10 -0700
Subject: [PATCH 43/55] tracker3-miners: update to 3.3.0

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index adc11e7970c1..2660322eaf67 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
@@ -26,7 +26,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
+checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
 
 # relies on unsupported ops in chroot
 do_check() {

From b3791c2d6fe221b5f17d3d1a4cd11070fa0e5359 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 44/55] epiphany: update to 42.0

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..f58f33639b37 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3

From 5264f1a2e5ea7eaedde28daf57339a732560b2a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 45/55] gnome-initial-setup: update to 42.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 6e7931930878..f63ece2484f6 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=41.4
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,7 +10,7 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-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
- pango-devel"
+ pango-devel libhandy1-devel"
 depends="iso-codes"
 short_desc="GNOME initial setup"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+checksum=cbf3e386d2acb5f4ecbb118ffb703da12901e84b80c244749428101eac47eaa7

From 98078f144e43f5659811491aa4e0b281bd57e884 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 46/55] gnome-clocks: update to 42.0

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..2afb26fe0735 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
 makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Clock application for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0

From 9cf95cdfba3e4d0c16337ac24fa651d37f0d78bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 47/55] gnome-calendar: update to 42.0

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..15d466f885a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,19 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel
+ libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa
 
 build_options="gir"
 build_options_default="gir"

From 199027d0e7a942be57e22a1b484e325ddb64eaec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 48/55] gnome-builder: update to 42.0

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..03057a6adfe3 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper=qemu
@@ -18,9 +18,9 @@ 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-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=52efd296d68b2ff182341c0481dcfd70654c408bdb679fceb76db9703c22428f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 9c258be7c60dc126d5d94bde0970bdeb8ae6c4d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:33:30 -0700
Subject: [PATCH 49/55] gnome-todo: rebuild against libportal 0.6

---
 srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
 srcpkgs/gnome-todo/template                 |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json          | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build             | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+         {
+             "name" : "libportal",
+             "buildsystem" : "meson",
++            "config-opts" : [
++                "-Dbackends=gtk4"
++            ],
+             "sources" : [
+                 {
+                     "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+ 
+ #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+ 
+ plugins_deps += [
+-  dependency('libportal'),
++  dependency('libportal-gtk4'),
+ ]
+ 
+ plugins_sources += files(
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..56713aec4a4c 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=41.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 6a060adb7faca01e17a24fba2e283680646100d0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 50/55] gnome-weather: update to 42.0

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

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
 lib32disabled=yes

From 5b2d9f6b32d3f6724cf0ade2b960581a8286de5d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 51/55] gnome-user-docs: update to 42.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 579bb4f407f0..773c9913d74f 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=41.2
+version=42.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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905

From 2f83f4f2b1f6ad39cc8ae116815873b8d8eb548d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 52/55] gnome-core: update to 42.0

---
 srcpkgs/gnome-core/template | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..9d5a23f20f55 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=41.0
+version=42.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -9,44 +9,45 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=42.0
+ at-spi2-core>=2.44.0
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
  evolution-data-server>=3.42.0
- folks>=0.14.0
+ folks>=0.15.4
  font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=42.0
  geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
  gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-backgrounds>=42.0
+ gnome-bluetooth>=42.0
  gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=42.0
+ gnome-desktop>=42.0
+ gnome-initial-setup>=42.0
  gnome-keyring>=40.0
  gnome-online-accounts>=3.40.0
  gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
+ gnome-session>=42.0
+ gnome-settings-daemon>=42.1
+ gnome-shell>=42.0
+ gnome-shell-extensions>=42.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-user-docs>=42.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
+ gsettings-desktop-schemas>=42.0
  gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ mutter>=42.0
+ nautilus>=42.0
  sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
+ tracker3>=3.3.0
+ yelp>=42.0
+ xdg-desktop-portal-gtk>=1.14.0
+ xdg-desktop-portal-gnome>=42.0
  zenity>=3.41.0"

From 678528eb5fb33d93b7737d478d62a1f1d0605d7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:01 -0700
Subject: [PATCH 53/55] gnome-terminal: update to 3.43.90

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 4853fb46511a..e48dcd8a4117 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.42.2
+version=3.43.90
 revision=1
 build_style=meson
 configure_args="-Dnautilus_extension=true -Db_ndebug=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0
+checksum=a50a723a874d364a0fefc19f994d885545aa60a51d6818a62ff90f82ff53c9d6
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From 96341044b798b374b72f01057fef0b97708dcadd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:34 -0700
Subject: [PATCH 54/55] yelp-xsl: update to 42.0

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

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 1858aeba250c..1237552d24f7 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=41.1
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54
+checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846

From c20b442199584537330a8c7ae49cab5da6f0a337 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:52 -0700
Subject: [PATCH 55/55] yelp-tools: update to 42.0

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index ac7dd742357f..8ce722e9b5f2 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config itstool libxslt python3-lxml"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272
+checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4

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

* Re: [PR PATCH] [Updated] [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
                   ` (5 preceding siblings ...)
  2022-03-24  1:29 ` oreo639
@ 2022-03-24  1:37 ` oreo639
  2022-03-24  1:52 ` oreo639
                   ` (274 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  1:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gnome42
https://github.com/void-linux/void-packages/pull/36311

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

[CI Skip]

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

Depends on: https://github.com/void-linux/void-packages/pull/36241

Blocking libsoup3:
+ gnome-online-accounts
+ evolution-data-server

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36311.patch is attached

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

From aba55512994968bffcfb15717efcbf404b1ab3f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:09 -0700
Subject: [PATCH 01/56] xdg-desktop-portal: update to 1.14.1

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..5d9fb873dfe6 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false"
 hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
  libportal-devel"
 checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec
 
 do_check() {
 	# some tests require a dbus session

From 1f91fa7f882b3f142b70d1153c9e027a98d01d45 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 02/56] xdg-desktop-portal-gtk: update to 1.14.0

---
 srcpkgs/xdg-desktop-portal-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..597f5977cabf 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gtk'
 pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
 
 post_install() {
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From d5628e5ff76714567ac51c06b93b98644f84084e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:49 -0700
Subject: [PATCH 03/56] xdg-desktop-portal-kde: update to 5.24.3

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 10169eb0f394..23aaba046f68 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ea5ba329468449640f8bfb2ab4c92daf2b214826 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 04/56] New package: xdg-desktop-portal-gnome-42.0.1

---
 srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..b7951deec327
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,20 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.0.1
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/tmp"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+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"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 9adee4b423b48f10180a36c4382b52556723f758 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 05/56] adwaita-icon-theme: update to 42.0

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0

From 09a20032e5b736ac1692df3a484f6a4f3ba5afc4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 06/56] at-spi2-core: update to 2.44.0

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..898d62a5e843 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.42.0
+version=2.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
 
 # Package build options
 build_options="gir"

From c031609764ec4a984bcf19286b9790c5e9161926 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 07/56] baobab: update to 42.0

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc

From 025861edcd5287d15e99bef17346b0b56ebb6f51 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:34 -0700
Subject: [PATCH 08/56] colord-gtk: 0.3.0

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

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..87cd02b712f2 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
@@ -9,13 +9,13 @@ configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
 build_options_default="vala"

From 60b4bb6706ad317b0ac40618b5b1a2abc09afe99 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 09/56] eog: update to 42.0

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..46220222bbc7 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,20 @@
 # Template file for 'eog'
 pkgname=eog
-version=41.1
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From f502b3f3801f4f22a22b0d07dd72deca6668f1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 10/56] eog-plugins: update to 42.0

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..3eca07a155c8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.8
+version=42.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+makedepends="eog-devel libhandy1-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
 depends="eog gsettings-desktop-schemas python3-gobject"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa
 python_version=3
 lib32disabled=yes

From d05e117f846f8141be68abac071f788c6f7de239 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:39:43 -0700
Subject: [PATCH 11/56] gfbgraph: update to 0.2.5

---
 srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
 srcpkgs/gfbgraph/template                |  8 +---
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch

diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build                   | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build               | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+   'libportal',
+   required: true,
++  version: '>= 0.5',
+   fallback: ['libportal', 'libportal_dep'],
+   default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+ 
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ 
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+   dependencies: [
+     dep_gtk,
+     dep_libportal,
++    dep_libportal_gtk3,
+     dep_lm
+   ],
+   install: true,
+-- 
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..844c47bed55d 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
 
 build_options="gir"
 build_options_default="gir"
@@ -27,10 +27,6 @@ do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }

From 698325b3e6f4dbb0c674ac0bdc66fb12c6bd8fb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:40:26 -0700
Subject: [PATCH 12/56] gjs: update to 1.72.0

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index b028c09437bb..7111cbbac913 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.70.1
+version=1.72.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f
+checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -35,7 +35,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da8ae7f52252f539bf1d07bb2397eba18d4fba3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 13/56] libgweather: update to 4.0.0

---
 common/shlibs                | 2 +-
 srcpkgs/libgweather/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..c967eeb38ca6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,7 +1126,7 @@ libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..429efd165b71 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,10 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"
@@ -13,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
 
 build_options="gir"
 build_options_default="gir"
@@ -21,7 +22,7 @@ build_options_default="gir"
 post_patch() {
 	# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
 	# And looks like we didn't ship it.
-	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
 }
 
 libgweather-devel_package() {

From 50fe1f4dac1efc0d7753b46eb1a1e917d16f2625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 14/56] gnome-bluetooth: update to 42.0

---
 common/shlibs                    | 1 +
 srcpkgs/gnome-bluetooth/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c967eeb38ca6..3193a11d63c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -684,6 +684,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1
 libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..35f65d377d78 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.5
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
 checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170
 
 build_options="gir"
 build_options_default="gir"

From e2d7433980ae929f5850e750e574f2a8fce60e9f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 15/56] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 3193a11d63c9..6e8ed86203a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3126,7 +3126,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From 858bf0146575594c7bd91b4958a227361995befc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 16/56] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 6e8ed86203a6..7cb67e0274e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 740ee4286c2272bf9febd8ffd79b97730bfe161c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 17/56] gcr: update to 3.41.0

---
 srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
 srcpkgs/gcr/template                         |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch

diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..2dd2a492430b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.40.0
+version=3.41.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
  libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
  $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme gnupg2"
 short_desc="GNOME crypto package"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From a9540e88b3c8779ceed233cd9506324346648259 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:54:25 -0700
Subject: [PATCH 18/56] glib-networking: update to 2.72.0

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..1893bd8eec6a 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
 make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 

From 516e3e08d4e60adf97e63645dc1b880cdd304411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:05 -0700
Subject: [PATCH 19/56] glib: update to 2.72.0

---
 .../glib/patches/disable-broken-tests.patch   | 79 -----------------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  4 +-
 3 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index c6bb8d96fadf..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
--  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..327b3231ca62 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From c919d5d886343bfc14c831f3e72734be6dcf0fbc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 20/56] gnome-autoar: update to 0.4.3

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

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
 
 build_options="gir"
 build_options_default="gir"

From 8ee8aaecb34e2597896694d0f2b8c6fbb8369a50 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 21/56] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d

From bbe8e45ae58b2a16836994a6461d4ac77dc412c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 22/56] gsettings-desktop-schemas: update to 42.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 3d841c45f8a8..52b4efeb1f80 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=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
 
 # Package build options
 build_options="gir"

From 7e69008f624655227d1451f5228095a131ea53c7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:11 -0700
Subject: [PATCH 23/56] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From f3f6f2bc0f2f74d846b4aa2bb73aed839c1494b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:44 -0700
Subject: [PATCH 24/56] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..e9985c260866 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen) $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
@@ -47,7 +47,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 609757662dec7cb5083cb2705439fab55a821ded Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:01:29 -0700
Subject: [PATCH 25/56] libsoup3: update to 3.0.5

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

diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template
index 61ed3d167f17..d0a352b7fd83 100644
--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@@ -1,6 +1,6 @@
 # Template file for 'libsoup3'
 pkgname=libsoup3
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc="libsoup-$version"
 build_style=meson
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
-checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b
+checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145
 make_check=no # gio tests can't run in chroot
 
 # Package build options

From 605de517fadaf3098aa0b18f00f42af7a81098b9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:03:46 -0700
Subject: [PATCH 26/56] libnma: enable gtk4

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

diff --git a/common/shlibs b/common/shlibs
index 7cb67e0274e1..56e886400c5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.34_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..dc9436742db3 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.34
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"

From c34199ccb51d62fbb659a361263db2a3fa4eedda Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:53:28 -0700
Subject: [PATCH 27/56] upower: update to 0.99.17

---
 srcpkgs/upower/template | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..34db34d424f9 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 08918f7eea896172ea7ef05d5f9cc7f294353707 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 28/56] yelp: update to 42.0

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..0800ea745b22 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=41.2
+version=42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,14 +15,13 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=20882556a9c5dbd3075930245e70371c6bac30eaa7a5ed09c7db127cda2013f7
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}
 }

From 337118c28883b9d00246fda84b0f025e23a689bc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 29/56] gnome-settings-daemon: update to 42.1

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9f8c9857eec6..d04f0b038033 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=41.0
+version=42.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 4cf4371758c8b70e59663616cb6de16748e1e759 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 30/56] gnome-control-center: update to 42.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..8be9bc1356c8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
@@ -12,10 +11,10 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
@@ -24,10 +23,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-
-build_options="cheese"
-build_options_default="cheese"
+checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
 
 desc_option_cheese="Add support for adding user account images with your webcam"
 

From fdda837d237047b9246c046228ee955d6ae4b1ee Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 31/56] evolution-data-server: update to 3.44.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 71db33706047..6b1ab31baf72 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,11 +1,11 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir vala)"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
 
 build_options="gir"
 build_options_default="gir"

From f614119d63c3990760a193cf9a110ad18c5318e5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 32/56] gnome-desktop: update to 42.0

---
 common/shlibs                                 |   3 +
 .../patches/00_fix_build_gtk4.patch           | 162 ++++++++++++++++++
 .../patches/01_optional_introspection.patch   |  93 ++++++++++
 srcpkgs/gnome-desktop/patches/build.patch     |  18 --
 .../patches/optionalise-gir.patch             |  47 -----
 srcpkgs/gnome-desktop/template                |   6 +-
 6 files changed, 261 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
 create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 56e886400c5c..7974b6cdd848 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
new file mode 100644
index 000000000000..7f2176c5a1d7
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
@@ -0,0 +1,162 @@
+From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 18:07:17 -0700
+Subject: [PATCH] meson: Fix build_gtk4 option
+
+---
+ libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index e81530ed..a0fb11f8 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
+   'gnome-xkb-info.h',
+ ]
+ 
+-install_headers(libgnome_desktop_base_headers,
+-  subdir: 'gnome-desktop-4.0/libgnome-desktop'
+-)
++if get_option('build_gtk4')
++  install_headers(libgnome_desktop_base_headers,
++    subdir: 'gnome-desktop-4.0/libgnome-desktop'
++  )
+ 
+-base_deps = [
+-  gdk_pixbuf_dep,
+-  glib_dep,
+-  gio_dep,
+-  gio_unix_dep,
+-  libsystemd_dep,
+-  schemas_dep,
+-  xkb_config_dep,
+-  xkbregistry_dep,
+-  iso_codes_dep,
+-  udev_dep,
+-  seccomp_dep,
+-  m_dep,
+-  rt_dep,
+-]
++  base_deps = [
++    gdk_pixbuf_dep,
++    glib_dep,
++    gio_dep,
++    gio_unix_dep,
++    libsystemd_dep,
++    schemas_dep,
++    xkb_config_dep,
++    xkbregistry_dep,
++    iso_codes_dep,
++    udev_dep,
++    seccomp_dep,
++    m_dep,
++    rt_dep,
++  ]
+ 
+-libgnome_desktop_base = library('gnome-desktop-4',
+-  sources: [
+-    libgnome_desktop_base_sources,
+-    libgnome_desktop_base_private_sources,
+-    dbus_idle_built_sources,
+-  ],
+-  dependencies: base_deps,
+-  soversion: soversion,
+-  version: libversion,
+-  c_args: libargs,
+-  link_args: base_ldflags,
+-  install: true,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base = library('gnome-desktop-4',
++    sources: [
++      libgnome_desktop_base_sources,
++      libgnome_desktop_base_private_sources,
++      dbus_idle_built_sources,
++    ],
++    dependencies: base_deps,
++    soversion: soversion,
++    version: libversion,
++    c_args: libargs,
++    link_args: base_ldflags,
++    install: true,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-  export_packages: 'gnome-desktop-4',
+-  namespace: 'GnomeDesktop',
+-  nsversion: '4.0',
+-  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-  identifier_prefix: 'Gnome',
+-  symbol_prefix: 'gnome',
+-  install: true,
+-)
++  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++    export_packages: 'gnome-desktop-4',
++    namespace: 'GnomeDesktop',
++    nsversion: '4.0',
++    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++    identifier_prefix: 'Gnome',
++    symbol_prefix: 'gnome',
++    install: true,
++  )
+ 
+-pkg.generate(
+-  libgnome_desktop_base,
+-  requires: ['gsettings-desktop-schemas'],
+-  version: meson.project_version(),
+-  name: 'gnome-desktop-4',
+-  filebase: 'gnome-desktop-4',
+-  description: 'Utility library for GNOME desktop components',
+-  subdirs: 'gnome-desktop-4.0',
+-)
++  pkg.generate(
++    libgnome_desktop_base,
++    requires: ['gsettings-desktop-schemas'],
++    version: meson.project_version(),
++    name: 'gnome-desktop-4',
++    filebase: 'gnome-desktop-4',
++    description: 'Utility library for GNOME desktop components',
++    subdirs: 'gnome-desktop-4.0',
++  )
+ 
+-libgnome_desktop_base_dep = declare_dependency(
+-  sources: [
+-    libgnome_desktop_base_gir,
+-  ],
+-  dependencies: base_deps,
+-  link_with: libgnome_desktop_base,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base_dep = declare_dependency(
++    sources: [
++      libgnome_desktop_base_gir,
++    ],
++    dependencies: base_deps,
++    link_with: libgnome_desktop_base,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-if gtk4_dep.found()
+   subdir('gnome-bg')
+   subdir('gnome-rr')
+ endif
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt            |  4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+     ],
+   )
+ 
+-  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-    export_packages: 'gnome-desktop-4',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '4.0',
+-    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true,
+-  )
++  if get_option('introspection')
++    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++      export_packages: 'gnome-desktop-4',
++      namespace: 'GnomeDesktop',
++      nsversion: '4.0',
++      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true,
++    )
++  endif
+ 
+   pkg.generate(
+     libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+     ],
+   )
+ 
+-  gnome.generate_gir(libgnome_desktop,
+-    sources: introspection_sources + libgnome_desktop_headers,
+-    export_packages: 'gnome-desktop-3.0',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '3.0',
+-    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true
+-  )
++  if get_option('introspection')
++    gnome.generate_gir(libgnome_desktop,
++      sources: introspection_sources + libgnome_desktop_headers,
++      export_packages: 'gnome-desktop-3.0',
++      namespace: 'GnomeDesktop',
++      nsversion: '3.0',
++      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true
++    )
++  endif
+ 
+   pkg.generate(
+     libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+   type: 'boolean', value: true, description: 'Build debug tools'
+ )
+ 
++option('introspection',
++  type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+   type: 'feature', description: 'Udev support'
+ )
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Wed Aug 12 05:26:00 2020 +0200
-
-    bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
- 
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
- 
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
--gnome.generate_gir(libgnome_desktop,
--  sources: introspection_sources + libgnome_desktop_headers,
--  export_packages: 'gnome-desktop-3.0',
--  namespace: 'GnomeDesktop',
--  nsversion: '3.0',
--  includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--  extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true
--)
-+if get_option('introspection')
-+  gnome.generate_gir(libgnome_desktop,
-+    sources: introspection_sources + libgnome_desktop_headers,
-+    export_packages: 'gnome-desktop-3.0',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '3.0',
-+    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+    extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true
-+  )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
-   type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+  type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..6c90cfd62663 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
  iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
  libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
 depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
+checksum=f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6
 make_check=no # needs X
 
 build_options="gir"

From 24f52ab1b3868d83e9c3dddfe75b7ccfd4078c4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:15:30 -0700
Subject: [PATCH 33/56] colord-gtk: update to 0.3.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 7974b6cdd848..497a53036e99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1137,6 +1137,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1

From 3c1a0ed6cc0dd4a8d500a0e3536959639f63a081 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 34/56] gnome-session: update to 42.0

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

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..21e3840e3e4e 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 47e433c215c82dbf5944a94fb25316a8ac938e31 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:13 -0700
Subject: [PATCH 35/56] gnome-shell: update to 42.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..8175828a8043 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,6 +10,7 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 6db13fb5de7fc656cfa3265bc8a018d2e1f6ae4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 36/56] gnome-shell-extensions: update to 42.0

---
 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 3f4be3c068de..33d6bf649b44 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=41.2
+version=42.0
 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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f

From 36f5312f659a40b520a5bfd96f29c2a79260f4cd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:21:44 -0700
Subject: [PATCH 37/56] mutter: update to 42.0

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

diff --git a/common/shlibs b/common/shlibs
index 497a53036e99..24ebdfd9a4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2983,10 +2983,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-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..a1aaef3cd47b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,9 +20,9 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ 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-9|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 
 mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-9/*.gir"
+		vmove "usr/lib/mutter-10/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 3e6d77635e3e728d05ef3585e86813072b001ab1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:22:28 -0700
Subject: [PATCH 38/56] gdm: update to 42.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..d302b7e0f1f5 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ configure_args="
 hostmakedepends="dconf gettext itstool pkg-config"
 makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
  iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
 depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
 
 conf_files="
 	/etc/gdm/custom.conf

From c58335fcbd6e12d916c55588d8648e80fbcae0c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:24:40 -0700
Subject: [PATCH 39/56] libportal: update to 0.6

---
 common/shlibs              |  4 +++-
 srcpkgs/libportal/template | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 24ebdfd9a4f7..597102cca2fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3933,7 +3933,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
 libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-0.6_1
+libportal-gtk4.so.1 libportal-0.6_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..2eceb1f4cd64 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,19 +1,21 @@
 # Template file for 'libportal'
 pkgname=libportal
-version=0.4
+version=0.6
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool vala vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if vala vala)
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
 short_desc="Flatpak portal library"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/flatpak/libportal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
 
-build_options="gtk_doc"
+build_options="vala gtk_doc"
+build_options_default="vala gtk_doc"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gtk_doc"
@@ -27,7 +29,10 @@ libportal-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }

From a17a338640ce5f026efafeded20fb8bea3b64251 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:25:18 -0700
Subject: [PATCH 40/56] gcolor3: rebuild against libportal 0.6

---
 srcpkgs/gcolor3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..03ec72506db0 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,7 +1,7 @@
 # Template file for 'gcolor3'
 pkgname=gcolor3
 version=2.4.0
-revision=1
+revision=2
 wrksrc="gcolor3-v${version}"
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"

From 6fae632ce4ed3e799770c13ec9a32c5d357c9d70 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 41/56] nautilus: update to 42.0

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..66a6765f7bd1 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+checksum=3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 0f1dc533a0f251b93fa954e20e658b434bf0d043 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:44 -0700
Subject: [PATCH 42/56] tracker3: update to 3.3.0

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

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 3ae12716faa5..d1e383150f6d 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3'
 pkgname=tracker3
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-${version}
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://live.gnome.org/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"

From 5c255c37cc79ae89bf15a9e42aaa6294e85a5bc1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:27:10 -0700
Subject: [PATCH 43/56] tracker3-miners: update to 3.3.0

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index adc11e7970c1..2660322eaf67 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
@@ -26,7 +26,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
+checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
 
 # relies on unsupported ops in chroot
 do_check() {

From b3791c2d6fe221b5f17d3d1a4cd11070fa0e5359 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 44/56] epiphany: update to 42.0

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..f58f33639b37 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3

From 5264f1a2e5ea7eaedde28daf57339a732560b2a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 45/56] gnome-initial-setup: update to 42.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 6e7931930878..f63ece2484f6 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=41.4
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,7 +10,7 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-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
- pango-devel"
+ pango-devel libhandy1-devel"
 depends="iso-codes"
 short_desc="GNOME initial setup"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+checksum=cbf3e386d2acb5f4ecbb118ffb703da12901e84b80c244749428101eac47eaa7

From 98078f144e43f5659811491aa4e0b281bd57e884 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 46/56] gnome-clocks: update to 42.0

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..2afb26fe0735 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
 makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Clock application for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0

From 9cf95cdfba3e4d0c16337ac24fa651d37f0d78bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 47/56] gnome-calendar: update to 42.0

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..15d466f885a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,19 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel
+ libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa
 
 build_options="gir"
 build_options_default="gir"

From 199027d0e7a942be57e22a1b484e325ddb64eaec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 48/56] gnome-builder: update to 42.0

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..03057a6adfe3 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper=qemu
@@ -18,9 +18,9 @@ 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-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=52efd296d68b2ff182341c0481dcfd70654c408bdb679fceb76db9703c22428f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 9c258be7c60dc126d5d94bde0970bdeb8ae6c4d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:33:30 -0700
Subject: [PATCH 49/56] gnome-todo: rebuild against libportal 0.6

---
 srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
 srcpkgs/gnome-todo/template                 |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json          | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build             | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+         {
+             "name" : "libportal",
+             "buildsystem" : "meson",
++            "config-opts" : [
++                "-Dbackends=gtk4"
++            ],
+             "sources" : [
+                 {
+                     "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+ 
+ #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+ 
+ plugins_deps += [
+-  dependency('libportal'),
++  dependency('libportal-gtk4'),
+ ]
+ 
+ plugins_sources += files(
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..56713aec4a4c 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=41.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 6a060adb7faca01e17a24fba2e283680646100d0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 50/56] gnome-weather: update to 42.0

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

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
 lib32disabled=yes

From 5b2d9f6b32d3f6724cf0ade2b960581a8286de5d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 51/56] gnome-user-docs: update to 42.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 579bb4f407f0..773c9913d74f 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=41.2
+version=42.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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905

From 2f83f4f2b1f6ad39cc8ae116815873b8d8eb548d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 52/56] gnome-core: update to 42.0

---
 srcpkgs/gnome-core/template | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..9d5a23f20f55 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=41.0
+version=42.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -9,44 +9,45 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=42.0
+ at-spi2-core>=2.44.0
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
  evolution-data-server>=3.42.0
- folks>=0.14.0
+ folks>=0.15.4
  font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=42.0
  geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
  gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-backgrounds>=42.0
+ gnome-bluetooth>=42.0
  gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=42.0
+ gnome-desktop>=42.0
+ gnome-initial-setup>=42.0
  gnome-keyring>=40.0
  gnome-online-accounts>=3.40.0
  gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
+ gnome-session>=42.0
+ gnome-settings-daemon>=42.1
+ gnome-shell>=42.0
+ gnome-shell-extensions>=42.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-user-docs>=42.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
+ gsettings-desktop-schemas>=42.0
  gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ mutter>=42.0
+ nautilus>=42.0
  sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
+ tracker3>=3.3.0
+ yelp>=42.0
+ xdg-desktop-portal-gtk>=1.14.0
+ xdg-desktop-portal-gnome>=42.0
  zenity>=3.41.0"

From 678528eb5fb33d93b7737d478d62a1f1d0605d7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:01 -0700
Subject: [PATCH 53/56] gnome-terminal: update to 3.43.90

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 4853fb46511a..e48dcd8a4117 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.42.2
+version=3.43.90
 revision=1
 build_style=meson
 configure_args="-Dnautilus_extension=true -Db_ndebug=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0
+checksum=a50a723a874d364a0fefc19f994d885545aa60a51d6818a62ff90f82ff53c9d6
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From 96341044b798b374b72f01057fef0b97708dcadd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:34 -0700
Subject: [PATCH 54/56] yelp-xsl: update to 42.0

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

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 1858aeba250c..1237552d24f7 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=41.1
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54
+checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846

From c20b442199584537330a8c7ae49cab5da6f0a337 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:52 -0700
Subject: [PATCH 55/56] yelp-tools: update to 42.0

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index ac7dd742357f..8ce722e9b5f2 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config itstool libxslt python3-lxml"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272
+checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4

From 93f9ca47c50645e3f01a485d5a085fe72170f8a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:37:11 -0700
Subject: [PATCH 56/56] libdazzle: update to 3.44.0

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

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 2abd4da3cfbd..80f398610ecb 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.42.0
+version=3.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925
+checksum=3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae
 
 do_check() {
 	xvfb-run ninja -C build test

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

* Re: [PR PATCH] [Updated] [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
                   ` (6 preceding siblings ...)
  2022-03-24  1:37 ` oreo639
@ 2022-03-24  1:52 ` oreo639
  2022-03-24  2:05 ` oreo639
                   ` (273 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  1:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gnome42
https://github.com/void-linux/void-packages/pull/36311

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

[CI Skip]

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

Depends on: https://github.com/void-linux/void-packages/pull/36241

Blocking libsoup3:
+ gnome-online-accounts
+ evolution-data-server

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36311.patch is attached

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

From aba55512994968bffcfb15717efcbf404b1ab3f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:09 -0700
Subject: [PATCH 01/58] xdg-desktop-portal: update to 1.14.1

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..5d9fb873dfe6 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false"
 hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
  libportal-devel"
 checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec
 
 do_check() {
 	# some tests require a dbus session

From 1f91fa7f882b3f142b70d1153c9e027a98d01d45 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 02/58] xdg-desktop-portal-gtk: update to 1.14.0

---
 srcpkgs/xdg-desktop-portal-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..597f5977cabf 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gtk'
 pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
 
 post_install() {
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From d5628e5ff76714567ac51c06b93b98644f84084e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:49 -0700
Subject: [PATCH 03/58] xdg-desktop-portal-kde: update to 5.24.3

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 10169eb0f394..23aaba046f68 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ea5ba329468449640f8bfb2ab4c92daf2b214826 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 04/58] New package: xdg-desktop-portal-gnome-42.0.1

---
 srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..b7951deec327
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,20 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.0.1
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/tmp"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+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"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 9adee4b423b48f10180a36c4382b52556723f758 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 05/58] adwaita-icon-theme: update to 42.0

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0

From 09a20032e5b736ac1692df3a484f6a4f3ba5afc4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 06/58] at-spi2-core: update to 2.44.0

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..898d62a5e843 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.42.0
+version=2.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
 
 # Package build options
 build_options="gir"

From c031609764ec4a984bcf19286b9790c5e9161926 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 07/58] baobab: update to 42.0

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc

From 025861edcd5287d15e99bef17346b0b56ebb6f51 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:34 -0700
Subject: [PATCH 08/58] colord-gtk: 0.3.0

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

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..87cd02b712f2 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
@@ -9,13 +9,13 @@ configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
 build_options_default="vala"

From 60b4bb6706ad317b0ac40618b5b1a2abc09afe99 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 09/58] eog: update to 42.0

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..46220222bbc7 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,20 @@
 # Template file for 'eog'
 pkgname=eog
-version=41.1
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From f502b3f3801f4f22a22b0d07dd72deca6668f1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 10/58] eog-plugins: update to 42.0

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..3eca07a155c8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.8
+version=42.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+makedepends="eog-devel libhandy1-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
 depends="eog gsettings-desktop-schemas python3-gobject"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa
 python_version=3
 lib32disabled=yes

From d05e117f846f8141be68abac071f788c6f7de239 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:39:43 -0700
Subject: [PATCH 11/58] gfbgraph: update to 0.2.5

---
 srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
 srcpkgs/gfbgraph/template                |  8 +---
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch

diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build                   | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build               | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+   'libportal',
+   required: true,
++  version: '>= 0.5',
+   fallback: ['libportal', 'libportal_dep'],
+   default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+ 
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ 
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+   dependencies: [
+     dep_gtk,
+     dep_libportal,
++    dep_libportal_gtk3,
+     dep_lm
+   ],
+   install: true,
+-- 
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..844c47bed55d 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
 
 build_options="gir"
 build_options_default="gir"
@@ -27,10 +27,6 @@ do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }

From 698325b3e6f4dbb0c674ac0bdc66fb12c6bd8fb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:40:26 -0700
Subject: [PATCH 12/58] gjs: update to 1.72.0

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index b028c09437bb..7111cbbac913 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.70.1
+version=1.72.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f
+checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -35,7 +35,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da8ae7f52252f539bf1d07bb2397eba18d4fba3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 13/58] libgweather: update to 4.0.0

---
 common/shlibs                | 2 +-
 srcpkgs/libgweather/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..c967eeb38ca6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,7 +1126,7 @@ libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..429efd165b71 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,10 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"
@@ -13,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
 
 build_options="gir"
 build_options_default="gir"
@@ -21,7 +22,7 @@ build_options_default="gir"
 post_patch() {
 	# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
 	# And looks like we didn't ship it.
-	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
 }
 
 libgweather-devel_package() {

From 50fe1f4dac1efc0d7753b46eb1a1e917d16f2625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 14/58] gnome-bluetooth: update to 42.0

---
 common/shlibs                    | 1 +
 srcpkgs/gnome-bluetooth/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c967eeb38ca6..3193a11d63c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -684,6 +684,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1
 libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..35f65d377d78 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.5
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
 checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170
 
 build_options="gir"
 build_options_default="gir"

From e2d7433980ae929f5850e750e574f2a8fce60e9f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 15/58] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 3193a11d63c9..6e8ed86203a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3126,7 +3126,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From 858bf0146575594c7bd91b4958a227361995befc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 16/58] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 6e8ed86203a6..7cb67e0274e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 740ee4286c2272bf9febd8ffd79b97730bfe161c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 17/58] gcr: update to 3.41.0

---
 srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
 srcpkgs/gcr/template                         |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch

diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..2dd2a492430b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.40.0
+version=3.41.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
  libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
  $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme gnupg2"
 short_desc="GNOME crypto package"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From a9540e88b3c8779ceed233cd9506324346648259 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:54:25 -0700
Subject: [PATCH 18/58] glib-networking: update to 2.72.0

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..1893bd8eec6a 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
 make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 

From 516e3e08d4e60adf97e63645dc1b880cdd304411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:05 -0700
Subject: [PATCH 19/58] glib: update to 2.72.0

---
 .../glib/patches/disable-broken-tests.patch   | 79 -----------------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  4 +-
 3 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index c6bb8d96fadf..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
--  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..327b3231ca62 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From c919d5d886343bfc14c831f3e72734be6dcf0fbc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 20/58] gnome-autoar: update to 0.4.3

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

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
 
 build_options="gir"
 build_options_default="gir"

From 8ee8aaecb34e2597896694d0f2b8c6fbb8369a50 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 21/58] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d

From bbe8e45ae58b2a16836994a6461d4ac77dc412c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 22/58] gsettings-desktop-schemas: update to 42.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 3d841c45f8a8..52b4efeb1f80 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=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
 
 # Package build options
 build_options="gir"

From 7e69008f624655227d1451f5228095a131ea53c7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:11 -0700
Subject: [PATCH 23/58] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From f3f6f2bc0f2f74d846b4aa2bb73aed839c1494b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:44 -0700
Subject: [PATCH 24/58] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..e9985c260866 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen) $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
@@ -47,7 +47,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 609757662dec7cb5083cb2705439fab55a821ded Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:01:29 -0700
Subject: [PATCH 25/58] libsoup3: update to 3.0.5

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

diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template
index 61ed3d167f17..d0a352b7fd83 100644
--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@@ -1,6 +1,6 @@
 # Template file for 'libsoup3'
 pkgname=libsoup3
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc="libsoup-$version"
 build_style=meson
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
-checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b
+checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145
 make_check=no # gio tests can't run in chroot
 
 # Package build options

From 605de517fadaf3098aa0b18f00f42af7a81098b9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:03:46 -0700
Subject: [PATCH 26/58] libnma: enable gtk4

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

diff --git a/common/shlibs b/common/shlibs
index 7cb67e0274e1..56e886400c5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.34_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..dc9436742db3 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.34
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"

From c34199ccb51d62fbb659a361263db2a3fa4eedda Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:53:28 -0700
Subject: [PATCH 27/58] upower: update to 0.99.17

---
 srcpkgs/upower/template | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..34db34d424f9 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 08918f7eea896172ea7ef05d5f9cc7f294353707 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 28/58] yelp: update to 42.0

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..0800ea745b22 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=41.2
+version=42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,14 +15,13 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=20882556a9c5dbd3075930245e70371c6bac30eaa7a5ed09c7db127cda2013f7
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}
 }

From 337118c28883b9d00246fda84b0f025e23a689bc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 29/58] gnome-settings-daemon: update to 42.1

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9f8c9857eec6..d04f0b038033 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=41.0
+version=42.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 4cf4371758c8b70e59663616cb6de16748e1e759 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 30/58] gnome-control-center: update to 42.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..8be9bc1356c8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
@@ -12,10 +11,10 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
@@ -24,10 +23,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-
-build_options="cheese"
-build_options_default="cheese"
+checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
 
 desc_option_cheese="Add support for adding user account images with your webcam"
 

From fdda837d237047b9246c046228ee955d6ae4b1ee Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 31/58] evolution-data-server: update to 3.44.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 71db33706047..6b1ab31baf72 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,11 +1,11 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir vala)"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
 
 build_options="gir"
 build_options_default="gir"

From f614119d63c3990760a193cf9a110ad18c5318e5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 32/58] gnome-desktop: update to 42.0

---
 common/shlibs                                 |   3 +
 .../patches/00_fix_build_gtk4.patch           | 162 ++++++++++++++++++
 .../patches/01_optional_introspection.patch   |  93 ++++++++++
 srcpkgs/gnome-desktop/patches/build.patch     |  18 --
 .../patches/optionalise-gir.patch             |  47 -----
 srcpkgs/gnome-desktop/template                |   6 +-
 6 files changed, 261 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
 create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 56e886400c5c..7974b6cdd848 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
new file mode 100644
index 000000000000..7f2176c5a1d7
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
@@ -0,0 +1,162 @@
+From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 18:07:17 -0700
+Subject: [PATCH] meson: Fix build_gtk4 option
+
+---
+ libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index e81530ed..a0fb11f8 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
+   'gnome-xkb-info.h',
+ ]
+ 
+-install_headers(libgnome_desktop_base_headers,
+-  subdir: 'gnome-desktop-4.0/libgnome-desktop'
+-)
++if get_option('build_gtk4')
++  install_headers(libgnome_desktop_base_headers,
++    subdir: 'gnome-desktop-4.0/libgnome-desktop'
++  )
+ 
+-base_deps = [
+-  gdk_pixbuf_dep,
+-  glib_dep,
+-  gio_dep,
+-  gio_unix_dep,
+-  libsystemd_dep,
+-  schemas_dep,
+-  xkb_config_dep,
+-  xkbregistry_dep,
+-  iso_codes_dep,
+-  udev_dep,
+-  seccomp_dep,
+-  m_dep,
+-  rt_dep,
+-]
++  base_deps = [
++    gdk_pixbuf_dep,
++    glib_dep,
++    gio_dep,
++    gio_unix_dep,
++    libsystemd_dep,
++    schemas_dep,
++    xkb_config_dep,
++    xkbregistry_dep,
++    iso_codes_dep,
++    udev_dep,
++    seccomp_dep,
++    m_dep,
++    rt_dep,
++  ]
+ 
+-libgnome_desktop_base = library('gnome-desktop-4',
+-  sources: [
+-    libgnome_desktop_base_sources,
+-    libgnome_desktop_base_private_sources,
+-    dbus_idle_built_sources,
+-  ],
+-  dependencies: base_deps,
+-  soversion: soversion,
+-  version: libversion,
+-  c_args: libargs,
+-  link_args: base_ldflags,
+-  install: true,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base = library('gnome-desktop-4',
++    sources: [
++      libgnome_desktop_base_sources,
++      libgnome_desktop_base_private_sources,
++      dbus_idle_built_sources,
++    ],
++    dependencies: base_deps,
++    soversion: soversion,
++    version: libversion,
++    c_args: libargs,
++    link_args: base_ldflags,
++    install: true,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-  export_packages: 'gnome-desktop-4',
+-  namespace: 'GnomeDesktop',
+-  nsversion: '4.0',
+-  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-  identifier_prefix: 'Gnome',
+-  symbol_prefix: 'gnome',
+-  install: true,
+-)
++  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++    export_packages: 'gnome-desktop-4',
++    namespace: 'GnomeDesktop',
++    nsversion: '4.0',
++    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++    identifier_prefix: 'Gnome',
++    symbol_prefix: 'gnome',
++    install: true,
++  )
+ 
+-pkg.generate(
+-  libgnome_desktop_base,
+-  requires: ['gsettings-desktop-schemas'],
+-  version: meson.project_version(),
+-  name: 'gnome-desktop-4',
+-  filebase: 'gnome-desktop-4',
+-  description: 'Utility library for GNOME desktop components',
+-  subdirs: 'gnome-desktop-4.0',
+-)
++  pkg.generate(
++    libgnome_desktop_base,
++    requires: ['gsettings-desktop-schemas'],
++    version: meson.project_version(),
++    name: 'gnome-desktop-4',
++    filebase: 'gnome-desktop-4',
++    description: 'Utility library for GNOME desktop components',
++    subdirs: 'gnome-desktop-4.0',
++  )
+ 
+-libgnome_desktop_base_dep = declare_dependency(
+-  sources: [
+-    libgnome_desktop_base_gir,
+-  ],
+-  dependencies: base_deps,
+-  link_with: libgnome_desktop_base,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base_dep = declare_dependency(
++    sources: [
++      libgnome_desktop_base_gir,
++    ],
++    dependencies: base_deps,
++    link_with: libgnome_desktop_base,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-if gtk4_dep.found()
+   subdir('gnome-bg')
+   subdir('gnome-rr')
+ endif
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt            |  4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+     ],
+   )
+ 
+-  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-    export_packages: 'gnome-desktop-4',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '4.0',
+-    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true,
+-  )
++  if get_option('introspection')
++    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++      export_packages: 'gnome-desktop-4',
++      namespace: 'GnomeDesktop',
++      nsversion: '4.0',
++      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true,
++    )
++  endif
+ 
+   pkg.generate(
+     libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+     ],
+   )
+ 
+-  gnome.generate_gir(libgnome_desktop,
+-    sources: introspection_sources + libgnome_desktop_headers,
+-    export_packages: 'gnome-desktop-3.0',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '3.0',
+-    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true
+-  )
++  if get_option('introspection')
++    gnome.generate_gir(libgnome_desktop,
++      sources: introspection_sources + libgnome_desktop_headers,
++      export_packages: 'gnome-desktop-3.0',
++      namespace: 'GnomeDesktop',
++      nsversion: '3.0',
++      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true
++    )
++  endif
+ 
+   pkg.generate(
+     libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+   type: 'boolean', value: true, description: 'Build debug tools'
+ )
+ 
++option('introspection',
++  type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+   type: 'feature', description: 'Udev support'
+ )
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Wed Aug 12 05:26:00 2020 +0200
-
-    bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
- 
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
- 
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
--gnome.generate_gir(libgnome_desktop,
--  sources: introspection_sources + libgnome_desktop_headers,
--  export_packages: 'gnome-desktop-3.0',
--  namespace: 'GnomeDesktop',
--  nsversion: '3.0',
--  includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--  extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true
--)
-+if get_option('introspection')
-+  gnome.generate_gir(libgnome_desktop,
-+    sources: introspection_sources + libgnome_desktop_headers,
-+    export_packages: 'gnome-desktop-3.0',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '3.0',
-+    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+    extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true
-+  )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
-   type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+  type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..6c90cfd62663 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
  iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
  libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
 depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
+checksum=f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6
 make_check=no # needs X
 
 build_options="gir"

From 24f52ab1b3868d83e9c3dddfe75b7ccfd4078c4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:15:30 -0700
Subject: [PATCH 33/58] colord-gtk: update to 0.3.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 7974b6cdd848..497a53036e99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1137,6 +1137,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1

From 3c1a0ed6cc0dd4a8d500a0e3536959639f63a081 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 34/58] gnome-session: update to 42.0

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

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..21e3840e3e4e 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 47e433c215c82dbf5944a94fb25316a8ac938e31 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:13 -0700
Subject: [PATCH 35/58] gnome-shell: update to 42.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..8175828a8043 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,6 +10,7 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 6db13fb5de7fc656cfa3265bc8a018d2e1f6ae4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 36/58] gnome-shell-extensions: update to 42.0

---
 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 3f4be3c068de..33d6bf649b44 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=41.2
+version=42.0
 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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f

From 36f5312f659a40b520a5bfd96f29c2a79260f4cd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:21:44 -0700
Subject: [PATCH 37/58] mutter: update to 42.0

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

diff --git a/common/shlibs b/common/shlibs
index 497a53036e99..24ebdfd9a4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2983,10 +2983,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-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..a1aaef3cd47b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,9 +20,9 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ 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-9|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 
 mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-9/*.gir"
+		vmove "usr/lib/mutter-10/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 3e6d77635e3e728d05ef3585e86813072b001ab1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:22:28 -0700
Subject: [PATCH 38/58] gdm: update to 42.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..d302b7e0f1f5 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ configure_args="
 hostmakedepends="dconf gettext itstool pkg-config"
 makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
  iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
 depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
 
 conf_files="
 	/etc/gdm/custom.conf

From c58335fcbd6e12d916c55588d8648e80fbcae0c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:24:40 -0700
Subject: [PATCH 39/58] libportal: update to 0.6

---
 common/shlibs              |  4 +++-
 srcpkgs/libportal/template | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 24ebdfd9a4f7..597102cca2fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3933,7 +3933,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
 libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-0.6_1
+libportal-gtk4.so.1 libportal-0.6_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..2eceb1f4cd64 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,19 +1,21 @@
 # Template file for 'libportal'
 pkgname=libportal
-version=0.4
+version=0.6
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool vala vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if vala vala)
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
 short_desc="Flatpak portal library"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/flatpak/libportal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
 
-build_options="gtk_doc"
+build_options="vala gtk_doc"
+build_options_default="vala gtk_doc"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gtk_doc"
@@ -27,7 +29,10 @@ libportal-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }

From a17a338640ce5f026efafeded20fb8bea3b64251 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:25:18 -0700
Subject: [PATCH 40/58] gcolor3: rebuild against libportal 0.6

---
 srcpkgs/gcolor3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..03ec72506db0 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,7 +1,7 @@
 # Template file for 'gcolor3'
 pkgname=gcolor3
 version=2.4.0
-revision=1
+revision=2
 wrksrc="gcolor3-v${version}"
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"

From 6fae632ce4ed3e799770c13ec9a32c5d357c9d70 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 41/58] nautilus: update to 42.0

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..66a6765f7bd1 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+checksum=3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 0f1dc533a0f251b93fa954e20e658b434bf0d043 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:44 -0700
Subject: [PATCH 42/58] tracker3: update to 3.3.0

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

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 3ae12716faa5..d1e383150f6d 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3'
 pkgname=tracker3
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-${version}
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://live.gnome.org/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"

From 5c255c37cc79ae89bf15a9e42aaa6294e85a5bc1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:27:10 -0700
Subject: [PATCH 43/58] tracker3-miners: update to 3.3.0

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index adc11e7970c1..2660322eaf67 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
@@ -26,7 +26,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
+checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
 
 # relies on unsupported ops in chroot
 do_check() {

From b3791c2d6fe221b5f17d3d1a4cd11070fa0e5359 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 44/58] epiphany: update to 42.0

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..f58f33639b37 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3

From 5264f1a2e5ea7eaedde28daf57339a732560b2a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 45/58] gnome-initial-setup: update to 42.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 6e7931930878..f63ece2484f6 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=41.4
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,7 +10,7 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-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
- pango-devel"
+ pango-devel libhandy1-devel"
 depends="iso-codes"
 short_desc="GNOME initial setup"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+checksum=cbf3e386d2acb5f4ecbb118ffb703da12901e84b80c244749428101eac47eaa7

From 98078f144e43f5659811491aa4e0b281bd57e884 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 46/58] gnome-clocks: update to 42.0

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..2afb26fe0735 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
 makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Clock application for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0

From 9cf95cdfba3e4d0c16337ac24fa651d37f0d78bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 47/58] gnome-calendar: update to 42.0

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..15d466f885a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,19 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel
+ libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa
 
 build_options="gir"
 build_options_default="gir"

From 199027d0e7a942be57e22a1b484e325ddb64eaec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 48/58] gnome-builder: update to 42.0

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..03057a6adfe3 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper=qemu
@@ -18,9 +18,9 @@ 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-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=52efd296d68b2ff182341c0481dcfd70654c408bdb679fceb76db9703c22428f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 9c258be7c60dc126d5d94bde0970bdeb8ae6c4d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:33:30 -0700
Subject: [PATCH 49/58] gnome-todo: rebuild against libportal 0.6

---
 srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
 srcpkgs/gnome-todo/template                 |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json          | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build             | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+         {
+             "name" : "libportal",
+             "buildsystem" : "meson",
++            "config-opts" : [
++                "-Dbackends=gtk4"
++            ],
+             "sources" : [
+                 {
+                     "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+ 
+ #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+ 
+ plugins_deps += [
+-  dependency('libportal'),
++  dependency('libportal-gtk4'),
+ ]
+ 
+ plugins_sources += files(
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..56713aec4a4c 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=41.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 6a060adb7faca01e17a24fba2e283680646100d0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 50/58] gnome-weather: update to 42.0

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

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
 lib32disabled=yes

From 5b2d9f6b32d3f6724cf0ade2b960581a8286de5d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 51/58] gnome-user-docs: update to 42.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 579bb4f407f0..773c9913d74f 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=41.2
+version=42.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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905

From 2f83f4f2b1f6ad39cc8ae116815873b8d8eb548d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 52/58] gnome-core: update to 42.0

---
 srcpkgs/gnome-core/template | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..9d5a23f20f55 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=41.0
+version=42.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -9,44 +9,45 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=42.0
+ at-spi2-core>=2.44.0
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
  evolution-data-server>=3.42.0
- folks>=0.14.0
+ folks>=0.15.4
  font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=42.0
  geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
  gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-backgrounds>=42.0
+ gnome-bluetooth>=42.0
  gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=42.0
+ gnome-desktop>=42.0
+ gnome-initial-setup>=42.0
  gnome-keyring>=40.0
  gnome-online-accounts>=3.40.0
  gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
+ gnome-session>=42.0
+ gnome-settings-daemon>=42.1
+ gnome-shell>=42.0
+ gnome-shell-extensions>=42.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-user-docs>=42.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
+ gsettings-desktop-schemas>=42.0
  gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ mutter>=42.0
+ nautilus>=42.0
  sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
+ tracker3>=3.3.0
+ yelp>=42.0
+ xdg-desktop-portal-gtk>=1.14.0
+ xdg-desktop-portal-gnome>=42.0
  zenity>=3.41.0"

From 678528eb5fb33d93b7737d478d62a1f1d0605d7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:01 -0700
Subject: [PATCH 53/58] gnome-terminal: update to 3.43.90

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 4853fb46511a..e48dcd8a4117 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.42.2
+version=3.43.90
 revision=1
 build_style=meson
 configure_args="-Dnautilus_extension=true -Db_ndebug=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0
+checksum=a50a723a874d364a0fefc19f994d885545aa60a51d6818a62ff90f82ff53c9d6
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From 96341044b798b374b72f01057fef0b97708dcadd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:34 -0700
Subject: [PATCH 54/58] yelp-xsl: update to 42.0

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

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 1858aeba250c..1237552d24f7 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=41.1
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54
+checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846

From c20b442199584537330a8c7ae49cab5da6f0a337 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:52 -0700
Subject: [PATCH 55/58] yelp-tools: update to 42.0

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index ac7dd742357f..8ce722e9b5f2 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config itstool libxslt python3-lxml"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272
+checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4

From 93f9ca47c50645e3f01a485d5a085fe72170f8a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:37:11 -0700
Subject: [PATCH 56/58] libdazzle: update to 3.44.0

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

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 2abd4da3cfbd..80f398610ecb 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.42.0
+version=3.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925
+checksum=3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae
 
 do_check() {
 	xvfb-run ninja -C build test

From 3197959ca0a1f36b35faea20d9d72205ba39d618 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:47:38 -0700
Subject: [PATCH 57/58] evolution: update to 3.44.0

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

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 226c884f3c53..681d192c9826 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,25 +1,26 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
  -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
- -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON"
+ -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
+ -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2"
 hostmakedepends="intltool itstool pkg-config glib-devel"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
  evolution-data-server-devel gspell-devel libcanberra-devel
  libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
- gnome-desktop-devel libsoup-devel"
+ gnome-desktop-devel libsoup-devel cmark-devel"
 depends="gnome-keyring"
 short_desc="Integrated mail, addressbook and calendaring for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-42/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44629e6a02288ec100a66fd59413a068b6b9cd624bed3255aa29a166ea26d0b6
+checksum=df21d3df5224dfa842ea290effcd902afd4b1418608a4dfb6907a3b7d4d994f9
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From e10d50496ea375611e50ab1024d33e239e048aed Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:52:15 -0700
Subject: [PATCH 58/58] evolution-ews: update to 3.44.0

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 01b358864598..971810cb97cc 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.42.1
+version=3.44.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services"
 maintainer="Peter Kuchar <masaj@gmx.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-42/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d
+checksum=ab80a0e9e2ce767fb9e84aee065d0eb5ef502cd79b2e2ca451eca84292297a80

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

* Re: [PR PATCH] [Updated] [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
                   ` (7 preceding siblings ...)
  2022-03-24  1:52 ` oreo639
@ 2022-03-24  2:05 ` oreo639
  2022-03-24  2:11 ` oreo639
                   ` (272 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  2:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gnome42
https://github.com/void-linux/void-packages/pull/36311

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

[CI Skip]

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

Depends on: https://github.com/void-linux/void-packages/pull/36241

Blocking libsoup3:
+ gnome-online-accounts
+ evolution-data-server

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36311.patch is attached

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

From aba55512994968bffcfb15717efcbf404b1ab3f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:09 -0700
Subject: [PATCH 01/60] xdg-desktop-portal: update to 1.14.1

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..5d9fb873dfe6 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false"
 hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
  libportal-devel"
 checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec
 
 do_check() {
 	# some tests require a dbus session

From 1f91fa7f882b3f142b70d1153c9e027a98d01d45 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 02/60] xdg-desktop-portal-gtk: update to 1.14.0

---
 srcpkgs/xdg-desktop-portal-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..597f5977cabf 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gtk'
 pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
 
 post_install() {
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From d5628e5ff76714567ac51c06b93b98644f84084e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:49 -0700
Subject: [PATCH 03/60] xdg-desktop-portal-kde: update to 5.24.3

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 10169eb0f394..23aaba046f68 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ea5ba329468449640f8bfb2ab4c92daf2b214826 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 04/60] New package: xdg-desktop-portal-gnome-42.0.1

---
 srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..b7951deec327
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,20 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.0.1
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/tmp"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+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"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 9adee4b423b48f10180a36c4382b52556723f758 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 05/60] adwaita-icon-theme: update to 42.0

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0

From 09a20032e5b736ac1692df3a484f6a4f3ba5afc4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 06/60] at-spi2-core: update to 2.44.0

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..898d62a5e843 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.42.0
+version=2.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
 
 # Package build options
 build_options="gir"

From c031609764ec4a984bcf19286b9790c5e9161926 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 07/60] baobab: update to 42.0

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc

From 025861edcd5287d15e99bef17346b0b56ebb6f51 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:34 -0700
Subject: [PATCH 08/60] colord-gtk: 0.3.0

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

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..87cd02b712f2 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
@@ -9,13 +9,13 @@ configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
 build_options_default="vala"

From 60b4bb6706ad317b0ac40618b5b1a2abc09afe99 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 09/60] eog: update to 42.0

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..46220222bbc7 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,20 @@
 # Template file for 'eog'
 pkgname=eog
-version=41.1
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From f502b3f3801f4f22a22b0d07dd72deca6668f1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 10/60] eog-plugins: update to 42.0

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..3eca07a155c8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.8
+version=42.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+makedepends="eog-devel libhandy1-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
 depends="eog gsettings-desktop-schemas python3-gobject"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa
 python_version=3
 lib32disabled=yes

From d05e117f846f8141be68abac071f788c6f7de239 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:39:43 -0700
Subject: [PATCH 11/60] gfbgraph: update to 0.2.5

---
 srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
 srcpkgs/gfbgraph/template                |  8 +---
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch

diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build                   | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build               | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+   'libportal',
+   required: true,
++  version: '>= 0.5',
+   fallback: ['libportal', 'libportal_dep'],
+   default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+ 
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ 
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+   dependencies: [
+     dep_gtk,
+     dep_libportal,
++    dep_libportal_gtk3,
+     dep_lm
+   ],
+   install: true,
+-- 
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..844c47bed55d 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
 
 build_options="gir"
 build_options_default="gir"
@@ -27,10 +27,6 @@ do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }

From 698325b3e6f4dbb0c674ac0bdc66fb12c6bd8fb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:40:26 -0700
Subject: [PATCH 12/60] gjs: update to 1.72.0

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index b028c09437bb..7111cbbac913 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.70.1
+version=1.72.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f
+checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -35,7 +35,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da8ae7f52252f539bf1d07bb2397eba18d4fba3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 13/60] libgweather: update to 4.0.0

---
 common/shlibs                | 2 +-
 srcpkgs/libgweather/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..c967eeb38ca6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,7 +1126,7 @@ libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..429efd165b71 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,10 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"
@@ -13,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
 
 build_options="gir"
 build_options_default="gir"
@@ -21,7 +22,7 @@ build_options_default="gir"
 post_patch() {
 	# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
 	# And looks like we didn't ship it.
-	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
 }
 
 libgweather-devel_package() {

From 50fe1f4dac1efc0d7753b46eb1a1e917d16f2625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 14/60] gnome-bluetooth: update to 42.0

---
 common/shlibs                    | 1 +
 srcpkgs/gnome-bluetooth/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c967eeb38ca6..3193a11d63c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -684,6 +684,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1
 libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..35f65d377d78 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.5
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
 checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170
 
 build_options="gir"
 build_options_default="gir"

From e2d7433980ae929f5850e750e574f2a8fce60e9f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 15/60] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 3193a11d63c9..6e8ed86203a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3126,7 +3126,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From 858bf0146575594c7bd91b4958a227361995befc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 16/60] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 6e8ed86203a6..7cb67e0274e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 740ee4286c2272bf9febd8ffd79b97730bfe161c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 17/60] gcr: update to 3.41.0

---
 srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
 srcpkgs/gcr/template                         |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch

diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..2dd2a492430b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.40.0
+version=3.41.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
  libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
  $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme gnupg2"
 short_desc="GNOME crypto package"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From a9540e88b3c8779ceed233cd9506324346648259 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:54:25 -0700
Subject: [PATCH 18/60] glib-networking: update to 2.72.0

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..1893bd8eec6a 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
 make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 

From 516e3e08d4e60adf97e63645dc1b880cdd304411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:05 -0700
Subject: [PATCH 19/60] glib: update to 2.72.0

---
 .../glib/patches/disable-broken-tests.patch   | 79 -----------------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  4 +-
 3 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index c6bb8d96fadf..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
--  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..327b3231ca62 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From c919d5d886343bfc14c831f3e72734be6dcf0fbc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 20/60] gnome-autoar: update to 0.4.3

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

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
 
 build_options="gir"
 build_options_default="gir"

From 8ee8aaecb34e2597896694d0f2b8c6fbb8369a50 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 21/60] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d

From bbe8e45ae58b2a16836994a6461d4ac77dc412c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 22/60] gsettings-desktop-schemas: update to 42.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 3d841c45f8a8..52b4efeb1f80 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=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
 
 # Package build options
 build_options="gir"

From 7e69008f624655227d1451f5228095a131ea53c7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:11 -0700
Subject: [PATCH 23/60] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From f3f6f2bc0f2f74d846b4aa2bb73aed839c1494b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:44 -0700
Subject: [PATCH 24/60] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..e9985c260866 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen) $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
@@ -47,7 +47,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 609757662dec7cb5083cb2705439fab55a821ded Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:01:29 -0700
Subject: [PATCH 25/60] libsoup3: update to 3.0.5

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

diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template
index 61ed3d167f17..d0a352b7fd83 100644
--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@@ -1,6 +1,6 @@
 # Template file for 'libsoup3'
 pkgname=libsoup3
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc="libsoup-$version"
 build_style=meson
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
-checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b
+checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145
 make_check=no # gio tests can't run in chroot
 
 # Package build options

From 605de517fadaf3098aa0b18f00f42af7a81098b9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:03:46 -0700
Subject: [PATCH 26/60] libnma: enable gtk4

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

diff --git a/common/shlibs b/common/shlibs
index 7cb67e0274e1..56e886400c5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.34_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..dc9436742db3 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.34
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"

From c34199ccb51d62fbb659a361263db2a3fa4eedda Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:53:28 -0700
Subject: [PATCH 27/60] upower: update to 0.99.17

---
 srcpkgs/upower/template | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..34db34d424f9 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 08918f7eea896172ea7ef05d5f9cc7f294353707 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 28/60] yelp: update to 42.0

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..0800ea745b22 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=41.2
+version=42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,14 +15,13 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=20882556a9c5dbd3075930245e70371c6bac30eaa7a5ed09c7db127cda2013f7
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}
 }

From 337118c28883b9d00246fda84b0f025e23a689bc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 29/60] gnome-settings-daemon: update to 42.1

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9f8c9857eec6..d04f0b038033 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=41.0
+version=42.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 4cf4371758c8b70e59663616cb6de16748e1e759 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 30/60] gnome-control-center: update to 42.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..8be9bc1356c8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
@@ -12,10 +11,10 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
@@ -24,10 +23,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-
-build_options="cheese"
-build_options_default="cheese"
+checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
 
 desc_option_cheese="Add support for adding user account images with your webcam"
 

From fdda837d237047b9246c046228ee955d6ae4b1ee Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 31/60] evolution-data-server: update to 3.44.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 71db33706047..6b1ab31baf72 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,11 +1,11 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir vala)"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
 
 build_options="gir"
 build_options_default="gir"

From f614119d63c3990760a193cf9a110ad18c5318e5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 32/60] gnome-desktop: update to 42.0

---
 common/shlibs                                 |   3 +
 .../patches/00_fix_build_gtk4.patch           | 162 ++++++++++++++++++
 .../patches/01_optional_introspection.patch   |  93 ++++++++++
 srcpkgs/gnome-desktop/patches/build.patch     |  18 --
 .../patches/optionalise-gir.patch             |  47 -----
 srcpkgs/gnome-desktop/template                |   6 +-
 6 files changed, 261 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
 create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 56e886400c5c..7974b6cdd848 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
new file mode 100644
index 000000000000..7f2176c5a1d7
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
@@ -0,0 +1,162 @@
+From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 18:07:17 -0700
+Subject: [PATCH] meson: Fix build_gtk4 option
+
+---
+ libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index e81530ed..a0fb11f8 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
+   'gnome-xkb-info.h',
+ ]
+ 
+-install_headers(libgnome_desktop_base_headers,
+-  subdir: 'gnome-desktop-4.0/libgnome-desktop'
+-)
++if get_option('build_gtk4')
++  install_headers(libgnome_desktop_base_headers,
++    subdir: 'gnome-desktop-4.0/libgnome-desktop'
++  )
+ 
+-base_deps = [
+-  gdk_pixbuf_dep,
+-  glib_dep,
+-  gio_dep,
+-  gio_unix_dep,
+-  libsystemd_dep,
+-  schemas_dep,
+-  xkb_config_dep,
+-  xkbregistry_dep,
+-  iso_codes_dep,
+-  udev_dep,
+-  seccomp_dep,
+-  m_dep,
+-  rt_dep,
+-]
++  base_deps = [
++    gdk_pixbuf_dep,
++    glib_dep,
++    gio_dep,
++    gio_unix_dep,
++    libsystemd_dep,
++    schemas_dep,
++    xkb_config_dep,
++    xkbregistry_dep,
++    iso_codes_dep,
++    udev_dep,
++    seccomp_dep,
++    m_dep,
++    rt_dep,
++  ]
+ 
+-libgnome_desktop_base = library('gnome-desktop-4',
+-  sources: [
+-    libgnome_desktop_base_sources,
+-    libgnome_desktop_base_private_sources,
+-    dbus_idle_built_sources,
+-  ],
+-  dependencies: base_deps,
+-  soversion: soversion,
+-  version: libversion,
+-  c_args: libargs,
+-  link_args: base_ldflags,
+-  install: true,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base = library('gnome-desktop-4',
++    sources: [
++      libgnome_desktop_base_sources,
++      libgnome_desktop_base_private_sources,
++      dbus_idle_built_sources,
++    ],
++    dependencies: base_deps,
++    soversion: soversion,
++    version: libversion,
++    c_args: libargs,
++    link_args: base_ldflags,
++    install: true,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-  export_packages: 'gnome-desktop-4',
+-  namespace: 'GnomeDesktop',
+-  nsversion: '4.0',
+-  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-  identifier_prefix: 'Gnome',
+-  symbol_prefix: 'gnome',
+-  install: true,
+-)
++  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++    export_packages: 'gnome-desktop-4',
++    namespace: 'GnomeDesktop',
++    nsversion: '4.0',
++    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++    identifier_prefix: 'Gnome',
++    symbol_prefix: 'gnome',
++    install: true,
++  )
+ 
+-pkg.generate(
+-  libgnome_desktop_base,
+-  requires: ['gsettings-desktop-schemas'],
+-  version: meson.project_version(),
+-  name: 'gnome-desktop-4',
+-  filebase: 'gnome-desktop-4',
+-  description: 'Utility library for GNOME desktop components',
+-  subdirs: 'gnome-desktop-4.0',
+-)
++  pkg.generate(
++    libgnome_desktop_base,
++    requires: ['gsettings-desktop-schemas'],
++    version: meson.project_version(),
++    name: 'gnome-desktop-4',
++    filebase: 'gnome-desktop-4',
++    description: 'Utility library for GNOME desktop components',
++    subdirs: 'gnome-desktop-4.0',
++  )
+ 
+-libgnome_desktop_base_dep = declare_dependency(
+-  sources: [
+-    libgnome_desktop_base_gir,
+-  ],
+-  dependencies: base_deps,
+-  link_with: libgnome_desktop_base,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base_dep = declare_dependency(
++    sources: [
++      libgnome_desktop_base_gir,
++    ],
++    dependencies: base_deps,
++    link_with: libgnome_desktop_base,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-if gtk4_dep.found()
+   subdir('gnome-bg')
+   subdir('gnome-rr')
+ endif
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt            |  4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+     ],
+   )
+ 
+-  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-    export_packages: 'gnome-desktop-4',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '4.0',
+-    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true,
+-  )
++  if get_option('introspection')
++    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++      export_packages: 'gnome-desktop-4',
++      namespace: 'GnomeDesktop',
++      nsversion: '4.0',
++      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true,
++    )
++  endif
+ 
+   pkg.generate(
+     libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+     ],
+   )
+ 
+-  gnome.generate_gir(libgnome_desktop,
+-    sources: introspection_sources + libgnome_desktop_headers,
+-    export_packages: 'gnome-desktop-3.0',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '3.0',
+-    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true
+-  )
++  if get_option('introspection')
++    gnome.generate_gir(libgnome_desktop,
++      sources: introspection_sources + libgnome_desktop_headers,
++      export_packages: 'gnome-desktop-3.0',
++      namespace: 'GnomeDesktop',
++      nsversion: '3.0',
++      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true
++    )
++  endif
+ 
+   pkg.generate(
+     libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+   type: 'boolean', value: true, description: 'Build debug tools'
+ )
+ 
++option('introspection',
++  type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+   type: 'feature', description: 'Udev support'
+ )
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Wed Aug 12 05:26:00 2020 +0200
-
-    bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
- 
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
- 
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
--gnome.generate_gir(libgnome_desktop,
--  sources: introspection_sources + libgnome_desktop_headers,
--  export_packages: 'gnome-desktop-3.0',
--  namespace: 'GnomeDesktop',
--  nsversion: '3.0',
--  includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--  extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true
--)
-+if get_option('introspection')
-+  gnome.generate_gir(libgnome_desktop,
-+    sources: introspection_sources + libgnome_desktop_headers,
-+    export_packages: 'gnome-desktop-3.0',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '3.0',
-+    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+    extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true
-+  )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
-   type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+  type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..6c90cfd62663 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
  iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
  libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
 depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
+checksum=f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6
 make_check=no # needs X
 
 build_options="gir"

From 24f52ab1b3868d83e9c3dddfe75b7ccfd4078c4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:15:30 -0700
Subject: [PATCH 33/60] colord-gtk: update to 0.3.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 7974b6cdd848..497a53036e99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1137,6 +1137,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1

From 3c1a0ed6cc0dd4a8d500a0e3536959639f63a081 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 34/60] gnome-session: update to 42.0

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

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..21e3840e3e4e 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 47e433c215c82dbf5944a94fb25316a8ac938e31 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:13 -0700
Subject: [PATCH 35/60] gnome-shell: update to 42.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..8175828a8043 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,6 +10,7 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 6db13fb5de7fc656cfa3265bc8a018d2e1f6ae4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 36/60] gnome-shell-extensions: update to 42.0

---
 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 3f4be3c068de..33d6bf649b44 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=41.2
+version=42.0
 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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f

From 36f5312f659a40b520a5bfd96f29c2a79260f4cd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:21:44 -0700
Subject: [PATCH 37/60] mutter: update to 42.0

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

diff --git a/common/shlibs b/common/shlibs
index 497a53036e99..24ebdfd9a4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2983,10 +2983,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-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..a1aaef3cd47b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,9 +20,9 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ 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-9|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 
 mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-9/*.gir"
+		vmove "usr/lib/mutter-10/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 3e6d77635e3e728d05ef3585e86813072b001ab1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:22:28 -0700
Subject: [PATCH 38/60] gdm: update to 42.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..d302b7e0f1f5 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ configure_args="
 hostmakedepends="dconf gettext itstool pkg-config"
 makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
  iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
 depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
 
 conf_files="
 	/etc/gdm/custom.conf

From c58335fcbd6e12d916c55588d8648e80fbcae0c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:24:40 -0700
Subject: [PATCH 39/60] libportal: update to 0.6

---
 common/shlibs              |  4 +++-
 srcpkgs/libportal/template | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 24ebdfd9a4f7..597102cca2fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3933,7 +3933,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
 libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-0.6_1
+libportal-gtk4.so.1 libportal-0.6_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..2eceb1f4cd64 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,19 +1,21 @@
 # Template file for 'libportal'
 pkgname=libportal
-version=0.4
+version=0.6
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool vala vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if vala vala)
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
 short_desc="Flatpak portal library"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/flatpak/libportal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
 
-build_options="gtk_doc"
+build_options="vala gtk_doc"
+build_options_default="vala gtk_doc"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gtk_doc"
@@ -27,7 +29,10 @@ libportal-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }

From a17a338640ce5f026efafeded20fb8bea3b64251 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:25:18 -0700
Subject: [PATCH 40/60] gcolor3: rebuild against libportal 0.6

---
 srcpkgs/gcolor3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..03ec72506db0 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,7 +1,7 @@
 # Template file for 'gcolor3'
 pkgname=gcolor3
 version=2.4.0
-revision=1
+revision=2
 wrksrc="gcolor3-v${version}"
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"

From 6fae632ce4ed3e799770c13ec9a32c5d357c9d70 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 41/60] nautilus: update to 42.0

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..66a6765f7bd1 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+checksum=3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 0f1dc533a0f251b93fa954e20e658b434bf0d043 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:44 -0700
Subject: [PATCH 42/60] tracker3: update to 3.3.0

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

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 3ae12716faa5..d1e383150f6d 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3'
 pkgname=tracker3
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-${version}
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://live.gnome.org/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"

From 5c255c37cc79ae89bf15a9e42aaa6294e85a5bc1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:27:10 -0700
Subject: [PATCH 43/60] tracker3-miners: update to 3.3.0

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index adc11e7970c1..2660322eaf67 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
@@ -26,7 +26,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
+checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
 
 # relies on unsupported ops in chroot
 do_check() {

From b3791c2d6fe221b5f17d3d1a4cd11070fa0e5359 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 44/60] epiphany: update to 42.0

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..f58f33639b37 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3

From 5264f1a2e5ea7eaedde28daf57339a732560b2a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 45/60] gnome-initial-setup: update to 42.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 6e7931930878..f63ece2484f6 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=41.4
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,7 +10,7 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-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
- pango-devel"
+ pango-devel libhandy1-devel"
 depends="iso-codes"
 short_desc="GNOME initial setup"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+checksum=cbf3e386d2acb5f4ecbb118ffb703da12901e84b80c244749428101eac47eaa7

From 98078f144e43f5659811491aa4e0b281bd57e884 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 46/60] gnome-clocks: update to 42.0

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..2afb26fe0735 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
 makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Clock application for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0

From 9cf95cdfba3e4d0c16337ac24fa651d37f0d78bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 47/60] gnome-calendar: update to 42.0

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..15d466f885a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,19 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel
+ libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa
 
 build_options="gir"
 build_options_default="gir"

From 199027d0e7a942be57e22a1b484e325ddb64eaec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 48/60] gnome-builder: update to 42.0

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..03057a6adfe3 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper=qemu
@@ -18,9 +18,9 @@ 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-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=52efd296d68b2ff182341c0481dcfd70654c408bdb679fceb76db9703c22428f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 9c258be7c60dc126d5d94bde0970bdeb8ae6c4d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:33:30 -0700
Subject: [PATCH 49/60] gnome-todo: rebuild against libportal 0.6

---
 srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
 srcpkgs/gnome-todo/template                 |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json          | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build             | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+         {
+             "name" : "libportal",
+             "buildsystem" : "meson",
++            "config-opts" : [
++                "-Dbackends=gtk4"
++            ],
+             "sources" : [
+                 {
+                     "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+ 
+ #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+ 
+ plugins_deps += [
+-  dependency('libportal'),
++  dependency('libportal-gtk4'),
+ ]
+ 
+ plugins_sources += files(
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..56713aec4a4c 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=41.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 6a060adb7faca01e17a24fba2e283680646100d0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 50/60] gnome-weather: update to 42.0

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

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
 lib32disabled=yes

From 5b2d9f6b32d3f6724cf0ade2b960581a8286de5d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 51/60] gnome-user-docs: update to 42.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 579bb4f407f0..773c9913d74f 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=41.2
+version=42.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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905

From 2f83f4f2b1f6ad39cc8ae116815873b8d8eb548d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 52/60] gnome-core: update to 42.0

---
 srcpkgs/gnome-core/template | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..9d5a23f20f55 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=41.0
+version=42.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -9,44 +9,45 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=42.0
+ at-spi2-core>=2.44.0
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
  evolution-data-server>=3.42.0
- folks>=0.14.0
+ folks>=0.15.4
  font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=42.0
  geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
  gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-backgrounds>=42.0
+ gnome-bluetooth>=42.0
  gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=42.0
+ gnome-desktop>=42.0
+ gnome-initial-setup>=42.0
  gnome-keyring>=40.0
  gnome-online-accounts>=3.40.0
  gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
+ gnome-session>=42.0
+ gnome-settings-daemon>=42.1
+ gnome-shell>=42.0
+ gnome-shell-extensions>=42.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-user-docs>=42.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
+ gsettings-desktop-schemas>=42.0
  gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ mutter>=42.0
+ nautilus>=42.0
  sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
+ tracker3>=3.3.0
+ yelp>=42.0
+ xdg-desktop-portal-gtk>=1.14.0
+ xdg-desktop-portal-gnome>=42.0
  zenity>=3.41.0"

From 678528eb5fb33d93b7737d478d62a1f1d0605d7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:01 -0700
Subject: [PATCH 53/60] gnome-terminal: update to 3.43.90

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 4853fb46511a..e48dcd8a4117 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.42.2
+version=3.43.90
 revision=1
 build_style=meson
 configure_args="-Dnautilus_extension=true -Db_ndebug=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0
+checksum=a50a723a874d364a0fefc19f994d885545aa60a51d6818a62ff90f82ff53c9d6
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From 96341044b798b374b72f01057fef0b97708dcadd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:34 -0700
Subject: [PATCH 54/60] yelp-xsl: update to 42.0

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

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 1858aeba250c..1237552d24f7 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=41.1
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54
+checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846

From c20b442199584537330a8c7ae49cab5da6f0a337 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:52 -0700
Subject: [PATCH 55/60] yelp-tools: update to 42.0

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index ac7dd742357f..8ce722e9b5f2 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config itstool libxslt python3-lxml"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272
+checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4

From 93f9ca47c50645e3f01a485d5a085fe72170f8a2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:37:11 -0700
Subject: [PATCH 56/60] libdazzle: update to 3.44.0

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

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 2abd4da3cfbd..80f398610ecb 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.42.0
+version=3.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925
+checksum=3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae
 
 do_check() {
 	xvfb-run ninja -C build test

From 3197959ca0a1f36b35faea20d9d72205ba39d618 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:47:38 -0700
Subject: [PATCH 57/60] evolution: update to 3.44.0

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

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 226c884f3c53..681d192c9826 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,25 +1,26 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
  -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
- -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON"
+ -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
+ -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2"
 hostmakedepends="intltool itstool pkg-config glib-devel"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
  evolution-data-server-devel gspell-devel libcanberra-devel
  libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
- gnome-desktop-devel libsoup-devel"
+ gnome-desktop-devel libsoup-devel cmark-devel"
 depends="gnome-keyring"
 short_desc="Integrated mail, addressbook and calendaring for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-42/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44629e6a02288ec100a66fd59413a068b6b9cd624bed3255aa29a166ea26d0b6
+checksum=df21d3df5224dfa842ea290effcd902afd4b1418608a4dfb6907a3b7d4d994f9
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From e10d50496ea375611e50ab1024d33e239e048aed Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:52:15 -0700
Subject: [PATCH 58/60] evolution-ews: update to 3.44.0

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 01b358864598..971810cb97cc 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.42.1
+version=3.44.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services"
 maintainer="Peter Kuchar <masaj@gmx.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-42/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d
+checksum=ab80a0e9e2ce767fb9e84aee065d0eb5ef502cd79b2e2ca451eca84292297a80

From 2a18136cda2cc13489f08e782a2dd07d65c867d5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:04:47 -0700
Subject: [PATCH 59/60] gtksourceview5: update to 5.4.0

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

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index c4c7d94f51e8..f6e41259b83d 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="gtksourceview-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc 'gtk-doc gi-docgen')"
 makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
  pcre2-devel"
 checkdepends="xvfb-run cantarell-fonts"
@@ -18,7 +18,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GtkSourceView"
 changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9
+checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637
 
 # Package build options
 build_options="gir gtk_doc"
@@ -42,7 +42,7 @@ gtksourceview5-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0

From 2749b01a5d96231178e3e2ab2a0523be409b2af2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:05:14 -0700
Subject: [PATCH 60/60] gnome-calculator: update to 42.0

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index b496cf715cc4..74f68b6e6dc8 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=41.1
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="cmake gettext glib-devel itstool pkg-config vala"
-makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel
- libmpc-devel libsoup-devel libhandy1-devel"
+makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel
+ libmpc-devel libsoup-devel gtk4-devel libadwaita-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
 short_desc="GNOME calculator"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calculator"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34
+checksum=a535a14ebea58e691a4b5a085256aed060a2c3f07384ac3a3d01832332a27e4a

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

* Re: [PR PATCH] [Updated] [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
                   ` (8 preceding siblings ...)
  2022-03-24  2:05 ` oreo639
@ 2022-03-24  2:11 ` oreo639
  2022-03-24  2:16 ` oreo639
                   ` (271 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  2:11 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gnome42
https://github.com/void-linux/void-packages/pull/36311

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

[CI Skip]

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

Depends on: https://github.com/void-linux/void-packages/pull/36241

Blocking libsoup3:
+ gnome-online-accounts
+ evolution-data-server

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36311.patch is attached

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

From aba55512994968bffcfb15717efcbf404b1ab3f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:09 -0700
Subject: [PATCH 01/60] xdg-desktop-portal: update to 1.14.1

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..5d9fb873dfe6 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false"
 hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
  libportal-devel"
 checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec
 
 do_check() {
 	# some tests require a dbus session

From 1f91fa7f882b3f142b70d1153c9e027a98d01d45 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 02/60] xdg-desktop-portal-gtk: update to 1.14.0

---
 srcpkgs/xdg-desktop-portal-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..597f5977cabf 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gtk'
 pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
 
 post_install() {
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From d5628e5ff76714567ac51c06b93b98644f84084e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:49 -0700
Subject: [PATCH 03/60] xdg-desktop-portal-kde: update to 5.24.3

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 10169eb0f394..23aaba046f68 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ea5ba329468449640f8bfb2ab4c92daf2b214826 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 04/60] New package: xdg-desktop-portal-gnome-42.0.1

---
 srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..b7951deec327
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,20 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.0.1
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/tmp"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+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"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 9adee4b423b48f10180a36c4382b52556723f758 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 05/60] adwaita-icon-theme: update to 42.0

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0

From 09a20032e5b736ac1692df3a484f6a4f3ba5afc4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 06/60] at-spi2-core: update to 2.44.0

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..898d62a5e843 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.42.0
+version=2.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
 
 # Package build options
 build_options="gir"

From c031609764ec4a984bcf19286b9790c5e9161926 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 07/60] baobab: update to 42.0

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc

From 025861edcd5287d15e99bef17346b0b56ebb6f51 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:34 -0700
Subject: [PATCH 08/60] colord-gtk: 0.3.0

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

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..87cd02b712f2 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
@@ -9,13 +9,13 @@ configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
 build_options_default="vala"

From 60b4bb6706ad317b0ac40618b5b1a2abc09afe99 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 09/60] eog: update to 42.0

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..46220222bbc7 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,20 @@
 # Template file for 'eog'
 pkgname=eog
-version=41.1
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From f502b3f3801f4f22a22b0d07dd72deca6668f1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 10/60] eog-plugins: update to 42.0

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..3eca07a155c8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.8
+version=42.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+makedepends="eog-devel libhandy1-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
 depends="eog gsettings-desktop-schemas python3-gobject"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa
 python_version=3
 lib32disabled=yes

From d05e117f846f8141be68abac071f788c6f7de239 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:39:43 -0700
Subject: [PATCH 11/60] gfbgraph: update to 0.2.5

---
 srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
 srcpkgs/gfbgraph/template                |  8 +---
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch

diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build                   | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build               | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+   'libportal',
+   required: true,
++  version: '>= 0.5',
+   fallback: ['libportal', 'libportal_dep'],
+   default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+ 
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ 
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+   dependencies: [
+     dep_gtk,
+     dep_libportal,
++    dep_libportal_gtk3,
+     dep_lm
+   ],
+   install: true,
+-- 
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..844c47bed55d 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
 
 build_options="gir"
 build_options_default="gir"
@@ -27,10 +27,6 @@ do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }

From 698325b3e6f4dbb0c674ac0bdc66fb12c6bd8fb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:40:26 -0700
Subject: [PATCH 12/60] gjs: update to 1.72.0

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index b028c09437bb..7111cbbac913 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.70.1
+version=1.72.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f
+checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -35,7 +35,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da8ae7f52252f539bf1d07bb2397eba18d4fba3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 13/60] libgweather: update to 4.0.0

---
 common/shlibs                | 2 +-
 srcpkgs/libgweather/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..c967eeb38ca6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,7 +1126,7 @@ libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..429efd165b71 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,10 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"
@@ -13,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
 
 build_options="gir"
 build_options_default="gir"
@@ -21,7 +22,7 @@ build_options_default="gir"
 post_patch() {
 	# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
 	# And looks like we didn't ship it.
-	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
 }
 
 libgweather-devel_package() {

From 50fe1f4dac1efc0d7753b46eb1a1e917d16f2625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 14/60] gnome-bluetooth: update to 42.0

---
 common/shlibs                    | 1 +
 srcpkgs/gnome-bluetooth/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c967eeb38ca6..3193a11d63c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -684,6 +684,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1
 libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..35f65d377d78 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.5
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
 checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170
 
 build_options="gir"
 build_options_default="gir"

From e2d7433980ae929f5850e750e574f2a8fce60e9f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 15/60] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 3193a11d63c9..6e8ed86203a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3126,7 +3126,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From 858bf0146575594c7bd91b4958a227361995befc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 16/60] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 6e8ed86203a6..7cb67e0274e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 740ee4286c2272bf9febd8ffd79b97730bfe161c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 17/60] gcr: update to 3.41.0

---
 srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
 srcpkgs/gcr/template                         |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch

diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..2dd2a492430b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.40.0
+version=3.41.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
  libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
  $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme gnupg2"
 short_desc="GNOME crypto package"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From a9540e88b3c8779ceed233cd9506324346648259 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:54:25 -0700
Subject: [PATCH 18/60] glib-networking: update to 2.72.0

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..1893bd8eec6a 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
 make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 

From 516e3e08d4e60adf97e63645dc1b880cdd304411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:05 -0700
Subject: [PATCH 19/60] glib: update to 2.72.0

---
 .../glib/patches/disable-broken-tests.patch   | 79 -----------------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  4 +-
 3 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index c6bb8d96fadf..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
--  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..327b3231ca62 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From c919d5d886343bfc14c831f3e72734be6dcf0fbc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 20/60] gnome-autoar: update to 0.4.3

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

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
 
 build_options="gir"
 build_options_default="gir"

From 8ee8aaecb34e2597896694d0f2b8c6fbb8369a50 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 21/60] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d

From bbe8e45ae58b2a16836994a6461d4ac77dc412c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 22/60] gsettings-desktop-schemas: update to 42.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 3d841c45f8a8..52b4efeb1f80 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=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
 
 # Package build options
 build_options="gir"

From 7e69008f624655227d1451f5228095a131ea53c7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:11 -0700
Subject: [PATCH 23/60] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From dc2b0d9dcca397eb13124d420198653faf942a6b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:44 -0700
Subject: [PATCH 24/60] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..9f3865dde59a 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc 'gtk-doc gi-docgen') $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
@@ -47,7 +47,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From a433d96aecc91b544f2677b20ecbe8c924204f14 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:01:29 -0700
Subject: [PATCH 25/60] libsoup3: update to 3.0.5

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

diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template
index 61ed3d167f17..d0a352b7fd83 100644
--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@@ -1,6 +1,6 @@
 # Template file for 'libsoup3'
 pkgname=libsoup3
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc="libsoup-$version"
 build_style=meson
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
-checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b
+checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145
 make_check=no # gio tests can't run in chroot
 
 # Package build options

From cd3af54e431935f117c48d74cdcee1a36c86c4e7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:03:46 -0700
Subject: [PATCH 26/60] libnma: enable gtk4

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

diff --git a/common/shlibs b/common/shlibs
index 7cb67e0274e1..56e886400c5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.34_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..dc9436742db3 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.34
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"

From b53b45432723abf7e3d1d2651c53ef103a6b61ee Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:53:28 -0700
Subject: [PATCH 27/60] upower: update to 0.99.17

---
 srcpkgs/upower/template | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..34db34d424f9 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From af2a8ab7c34709df91ecb36fc1c4848cdc61067d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 28/60] yelp: update to 42.0

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..0800ea745b22 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=41.2
+version=42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,14 +15,13 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=20882556a9c5dbd3075930245e70371c6bac30eaa7a5ed09c7db127cda2013f7
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}
 }

From ab2575f0e8f355042e36b0141f76184dd6140060 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 29/60] gnome-settings-daemon: update to 42.1

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9f8c9857eec6..d04f0b038033 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=41.0
+version=42.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From a0c6ca7f30114d3a3e29d10658c9a7eaa3a4776a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 30/60] gnome-control-center: update to 42.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..8be9bc1356c8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
@@ -12,10 +11,10 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
@@ -24,10 +23,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-
-build_options="cheese"
-build_options_default="cheese"
+checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
 
 desc_option_cheese="Add support for adding user account images with your webcam"
 

From 8da5b1964e3e83d3249ccc1ef709b0e2beff878c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 31/60] evolution-data-server: update to 3.44.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 71db33706047..6b1ab31baf72 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,11 +1,11 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir vala)"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
 
 build_options="gir"
 build_options_default="gir"

From 689177b34c434b660e78b2c5434e4d383b9c9a64 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 32/60] gnome-desktop: update to 42.0

---
 common/shlibs                                 |   3 +
 .../patches/00_fix_build_gtk4.patch           | 162 ++++++++++++++++++
 .../patches/01_optional_introspection.patch   |  93 ++++++++++
 srcpkgs/gnome-desktop/patches/build.patch     |  18 --
 .../patches/optionalise-gir.patch             |  47 -----
 srcpkgs/gnome-desktop/template                |   6 +-
 6 files changed, 261 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
 create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 56e886400c5c..7974b6cdd848 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
new file mode 100644
index 000000000000..7f2176c5a1d7
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
@@ -0,0 +1,162 @@
+From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 18:07:17 -0700
+Subject: [PATCH] meson: Fix build_gtk4 option
+
+---
+ libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index e81530ed..a0fb11f8 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
+   'gnome-xkb-info.h',
+ ]
+ 
+-install_headers(libgnome_desktop_base_headers,
+-  subdir: 'gnome-desktop-4.0/libgnome-desktop'
+-)
++if get_option('build_gtk4')
++  install_headers(libgnome_desktop_base_headers,
++    subdir: 'gnome-desktop-4.0/libgnome-desktop'
++  )
+ 
+-base_deps = [
+-  gdk_pixbuf_dep,
+-  glib_dep,
+-  gio_dep,
+-  gio_unix_dep,
+-  libsystemd_dep,
+-  schemas_dep,
+-  xkb_config_dep,
+-  xkbregistry_dep,
+-  iso_codes_dep,
+-  udev_dep,
+-  seccomp_dep,
+-  m_dep,
+-  rt_dep,
+-]
++  base_deps = [
++    gdk_pixbuf_dep,
++    glib_dep,
++    gio_dep,
++    gio_unix_dep,
++    libsystemd_dep,
++    schemas_dep,
++    xkb_config_dep,
++    xkbregistry_dep,
++    iso_codes_dep,
++    udev_dep,
++    seccomp_dep,
++    m_dep,
++    rt_dep,
++  ]
+ 
+-libgnome_desktop_base = library('gnome-desktop-4',
+-  sources: [
+-    libgnome_desktop_base_sources,
+-    libgnome_desktop_base_private_sources,
+-    dbus_idle_built_sources,
+-  ],
+-  dependencies: base_deps,
+-  soversion: soversion,
+-  version: libversion,
+-  c_args: libargs,
+-  link_args: base_ldflags,
+-  install: true,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base = library('gnome-desktop-4',
++    sources: [
++      libgnome_desktop_base_sources,
++      libgnome_desktop_base_private_sources,
++      dbus_idle_built_sources,
++    ],
++    dependencies: base_deps,
++    soversion: soversion,
++    version: libversion,
++    c_args: libargs,
++    link_args: base_ldflags,
++    install: true,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-  export_packages: 'gnome-desktop-4',
+-  namespace: 'GnomeDesktop',
+-  nsversion: '4.0',
+-  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-  identifier_prefix: 'Gnome',
+-  symbol_prefix: 'gnome',
+-  install: true,
+-)
++  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++    export_packages: 'gnome-desktop-4',
++    namespace: 'GnomeDesktop',
++    nsversion: '4.0',
++    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++    identifier_prefix: 'Gnome',
++    symbol_prefix: 'gnome',
++    install: true,
++  )
+ 
+-pkg.generate(
+-  libgnome_desktop_base,
+-  requires: ['gsettings-desktop-schemas'],
+-  version: meson.project_version(),
+-  name: 'gnome-desktop-4',
+-  filebase: 'gnome-desktop-4',
+-  description: 'Utility library for GNOME desktop components',
+-  subdirs: 'gnome-desktop-4.0',
+-)
++  pkg.generate(
++    libgnome_desktop_base,
++    requires: ['gsettings-desktop-schemas'],
++    version: meson.project_version(),
++    name: 'gnome-desktop-4',
++    filebase: 'gnome-desktop-4',
++    description: 'Utility library for GNOME desktop components',
++    subdirs: 'gnome-desktop-4.0',
++  )
+ 
+-libgnome_desktop_base_dep = declare_dependency(
+-  sources: [
+-    libgnome_desktop_base_gir,
+-  ],
+-  dependencies: base_deps,
+-  link_with: libgnome_desktop_base,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base_dep = declare_dependency(
++    sources: [
++      libgnome_desktop_base_gir,
++    ],
++    dependencies: base_deps,
++    link_with: libgnome_desktop_base,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-if gtk4_dep.found()
+   subdir('gnome-bg')
+   subdir('gnome-rr')
+ endif
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt            |  4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+     ],
+   )
+ 
+-  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-    export_packages: 'gnome-desktop-4',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '4.0',
+-    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true,
+-  )
++  if get_option('introspection')
++    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++      export_packages: 'gnome-desktop-4',
++      namespace: 'GnomeDesktop',
++      nsversion: '4.0',
++      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true,
++    )
++  endif
+ 
+   pkg.generate(
+     libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+     ],
+   )
+ 
+-  gnome.generate_gir(libgnome_desktop,
+-    sources: introspection_sources + libgnome_desktop_headers,
+-    export_packages: 'gnome-desktop-3.0',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '3.0',
+-    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+-    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-    identifier_prefix: 'Gnome',
+-    symbol_prefix: 'gnome',
+-    install: true
+-  )
++  if get_option('introspection')
++    gnome.generate_gir(libgnome_desktop,
++      sources: introspection_sources + libgnome_desktop_headers,
++      export_packages: 'gnome-desktop-3.0',
++      namespace: 'GnomeDesktop',
++      nsversion: '3.0',
++      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++      identifier_prefix: 'Gnome',
++      symbol_prefix: 'gnome',
++      install: true
++    )
++  endif
+ 
+   pkg.generate(
+     libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+   type: 'boolean', value: true, description: 'Build debug tools'
+ )
+ 
++option('introspection',
++  type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+   type: 'feature', description: 'Udev support'
+ )
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Wed Aug 12 05:26:00 2020 +0200
-
-    bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
- 
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
- 
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
--gnome.generate_gir(libgnome_desktop,
--  sources: introspection_sources + libgnome_desktop_headers,
--  export_packages: 'gnome-desktop-3.0',
--  namespace: 'GnomeDesktop',
--  nsversion: '3.0',
--  includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--  extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true
--)
-+if get_option('introspection')
-+  gnome.generate_gir(libgnome_desktop,
-+    sources: introspection_sources + libgnome_desktop_headers,
-+    export_packages: 'gnome-desktop-3.0',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '3.0',
-+    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+    extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true
-+  )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
-   type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+  type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..6c90cfd62663 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
  iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
  libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
 depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
+checksum=f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6
 make_check=no # needs X
 
 build_options="gir"

From bc996efda3ca899a6b04599ff9c7fb4486211653 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:15:30 -0700
Subject: [PATCH 33/60] colord-gtk: update to 0.3.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 7974b6cdd848..497a53036e99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1137,6 +1137,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1

From 7cbbf2a405ad6395096307a97735cdc784f95fca Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 34/60] gnome-session: update to 42.0

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

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..21e3840e3e4e 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 28a25924c003538fd926d921576505f1547f9a54 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:13 -0700
Subject: [PATCH 35/60] gnome-shell: update to 42.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..8175828a8043 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,6 +10,7 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 8a091b44bdc955ad911d387119788fbbd8e36920 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 36/60] gnome-shell-extensions: update to 42.0

---
 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 3f4be3c068de..33d6bf649b44 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=41.2
+version=42.0
 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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f

From 4129e89a6bd1c561a7074088d5ddcf57daa9bc7b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:21:44 -0700
Subject: [PATCH 37/60] mutter: update to 42.0

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

diff --git a/common/shlibs b/common/shlibs
index 497a53036e99..24ebdfd9a4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2983,10 +2983,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-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..a1aaef3cd47b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,9 +20,9 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ 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-9|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 
 mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-9/*.gir"
+		vmove "usr/lib/mutter-10/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From fa27124a9391e0f25f92efe912cb3c0478abd3ba Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:22:28 -0700
Subject: [PATCH 38/60] gdm: update to 42.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..d302b7e0f1f5 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ configure_args="
 hostmakedepends="dconf gettext itstool pkg-config"
 makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
  iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
 depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
 
 conf_files="
 	/etc/gdm/custom.conf

From 25d41315fc2858874de1ed946e60bd95d390ea1c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:24:40 -0700
Subject: [PATCH 39/60] libportal: update to 0.6

---
 common/shlibs              |  4 +++-
 srcpkgs/libportal/template | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 24ebdfd9a4f7..597102cca2fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3933,7 +3933,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
 libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-0.6_1
+libportal-gtk4.so.1 libportal-0.6_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..218d284f485b 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,19 +1,21 @@
 # Template file for 'libportal'
 pkgname=libportal
-version=0.4
+version=0.6
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool vala vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if vala vala)
+ $(vopt_if gtk_doc 'gtk-doc gi-docgen')"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
 short_desc="Flatpak portal library"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/flatpak/libportal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
 
-build_options="gtk_doc"
+build_options="vala gtk_doc"
+build_options_default="vala gtk_doc"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gtk_doc"
@@ -27,7 +29,10 @@ libportal-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }

From 1c2d1ead031b6d43fd6bee7eb3251d18c120f978 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:25:18 -0700
Subject: [PATCH 40/60] gcolor3: rebuild against libportal 0.6

---
 srcpkgs/gcolor3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..03ec72506db0 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,7 +1,7 @@
 # Template file for 'gcolor3'
 pkgname=gcolor3
 version=2.4.0
-revision=1
+revision=2
 wrksrc="gcolor3-v${version}"
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"

From 5ee52fb5c14557dc6ff831a131338693a0be700c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 41/60] nautilus: update to 42.0

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..66a6765f7bd1 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+checksum=3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 98cd81e971daded7cee1f2f266d1b36160c6005f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:44 -0700
Subject: [PATCH 42/60] tracker3: update to 3.3.0

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

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 3ae12716faa5..d1e383150f6d 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3'
 pkgname=tracker3
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-${version}
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://live.gnome.org/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"

From c2f8327a5038f8bef6e9c405275d85eb20810b0c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:27:10 -0700
Subject: [PATCH 43/60] tracker3-miners: update to 3.3.0

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index adc11e7970c1..2660322eaf67 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
@@ -26,7 +26,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
+checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
 
 # relies on unsupported ops in chroot
 do_check() {

From c1de05f0eb64bbb12511ba26ef68fc12292b8a09 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 44/60] epiphany: update to 42.0

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..f58f33639b37 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=41.3
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3

From e19805260a54ea54e75921a5db2f2e43501df796 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 45/60] gnome-initial-setup: update to 42.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 6e7931930878..f63ece2484f6 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=41.4
+version=42.0
 revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,7 +10,7 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-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
- pango-devel"
+ pango-devel libhandy1-devel"
 depends="iso-codes"
 short_desc="GNOME initial setup"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+checksum=cbf3e386d2acb5f4ecbb118ffb703da12901e84b80c244749428101eac47eaa7

From b1d9db0e57ddce441a186c2365e7facab247c93c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 46/60] gnome-clocks: update to 42.0

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..2afb26fe0735 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
 makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Clock application for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0

From b75ebff4e4a7227ae53ac935790d946134fc3c0e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 47/60] gnome-calendar: update to 42.0

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..15d466f885a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,19 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=41.2
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel
+ libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa
 
 build_options="gir"
 build_options_default="gir"

From 4a15befb47f5da2728f4986b296088d3f84c496d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 48/60] gnome-builder: update to 42.0

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..03057a6adfe3 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=41.3
+version=42.0
 revision=1
 build_style=meson
 build_helper=qemu
@@ -18,9 +18,9 @@ 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-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=52efd296d68b2ff182341c0481dcfd70654c408bdb679fceb76db9703c22428f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 90f225905377d97fe29ec2f02482e99b926f6f2a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:33:30 -0700
Subject: [PATCH 49/60] gnome-todo: rebuild against libportal 0.6

---
 srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
 srcpkgs/gnome-todo/template                 |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json          | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build             | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+         {
+             "name" : "libportal",
+             "buildsystem" : "meson",
++            "config-opts" : [
++                "-Dbackends=gtk4"
++            ],
+             "sources" : [
+                 {
+                     "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+ 
+ #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+ 
+ plugins_deps += [
+-  dependency('libportal'),
++  dependency('libportal-gtk4'),
+ ]
+ 
+ plugins_sources += files(
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..56713aec4a4c 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=41.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 48eead54b79e02da443b181408d2336a90993a9a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 50/60] gnome-weather: update to 42.0

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

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
 lib32disabled=yes

From f653435efa669a6ed896a3702758e98e7dcf2639 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 51/60] gnome-user-docs: update to 42.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 579bb4f407f0..773c9913d74f 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=41.2
+version=42.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/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905

From e1fa369b974106493019d9bdd2f6878460cb8d95 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 52/60] gnome-core: update to 42.0

---
 srcpkgs/gnome-core/template | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..9d5a23f20f55 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=41.0
+version=42.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -9,44 +9,45 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=42.0
+ at-spi2-core>=2.44.0
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
  evolution-data-server>=3.42.0
- folks>=0.14.0
+ folks>=0.15.4
  font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=42.0
  geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
  gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-backgrounds>=42.0
+ gnome-bluetooth>=42.0
  gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=42.0
+ gnome-desktop>=42.0
+ gnome-initial-setup>=42.0
  gnome-keyring>=40.0
  gnome-online-accounts>=3.40.0
  gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
+ gnome-session>=42.0
+ gnome-settings-daemon>=42.1
+ gnome-shell>=42.0
+ gnome-shell-extensions>=42.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-user-docs>=42.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
+ gsettings-desktop-schemas>=42.0
  gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ mutter>=42.0
+ nautilus>=42.0
  sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
+ tracker3>=3.3.0
+ yelp>=42.0
+ xdg-desktop-portal-gtk>=1.14.0
+ xdg-desktop-portal-gnome>=42.0
  zenity>=3.41.0"

From cfedd53c38afd83fa8e4ccfdbaf0f75922cc81d7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:01 -0700
Subject: [PATCH 53/60] gnome-terminal: update to 3.43.90

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 4853fb46511a..e48dcd8a4117 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.42.2
+version=3.43.90
 revision=1
 build_style=meson
 configure_args="-Dnautilus_extension=true -Db_ndebug=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0
+checksum=a50a723a874d364a0fefc19f994d885545aa60a51d6818a62ff90f82ff53c9d6
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From a56f6f6025b30e3c6207d0200989bf99bc5f2fdc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:34 -0700
Subject: [PATCH 54/60] yelp-xsl: update to 42.0

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

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 1858aeba250c..1237552d24f7 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=41.1
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54
+checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846

From c8046bd364ec209d3f00bc206497220326a816aa Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:52 -0700
Subject: [PATCH 55/60] yelp-tools: update to 42.0

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index ac7dd742357f..8ce722e9b5f2 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config itstool libxslt python3-lxml"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272
+checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4

From 2a9915421e1419a755dc2def7a4a0e8a576f8920 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:37:11 -0700
Subject: [PATCH 56/60] libdazzle: update to 3.44.0

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

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 2abd4da3cfbd..80f398610ecb 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.42.0
+version=3.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925
+checksum=3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae
 
 do_check() {
 	xvfb-run ninja -C build test

From 48abaa5e5964a133567371ff42f432f2bc183f4c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:47:38 -0700
Subject: [PATCH 57/60] evolution: update to 3.44.0

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

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 226c884f3c53..681d192c9826 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,25 +1,26 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
  -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
- -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON"
+ -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
+ -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2"
 hostmakedepends="intltool itstool pkg-config glib-devel"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
  evolution-data-server-devel gspell-devel libcanberra-devel
  libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
- gnome-desktop-devel libsoup-devel"
+ gnome-desktop-devel libsoup-devel cmark-devel"
 depends="gnome-keyring"
 short_desc="Integrated mail, addressbook and calendaring for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-42/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44629e6a02288ec100a66fd59413a068b6b9cd624bed3255aa29a166ea26d0b6
+checksum=df21d3df5224dfa842ea290effcd902afd4b1418608a4dfb6907a3b7d4d994f9
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 

From db01b62fad190a74f1477d0ddf3952082d5a0f12 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:52:15 -0700
Subject: [PATCH 58/60] evolution-ews: update to 3.44.0

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 01b358864598..971810cb97cc 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.42.1
+version=3.44.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services"
 maintainer="Peter Kuchar <masaj@gmx.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-42/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d
+checksum=ab80a0e9e2ce767fb9e84aee065d0eb5ef502cd79b2e2ca451eca84292297a80

From b8406480247890b8665929e4dd89664034811f37 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:04:47 -0700
Subject: [PATCH 59/60] gtksourceview5: update to 5.4.0

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

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index c4c7d94f51e8..f6e41259b83d 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="gtksourceview-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc 'gtk-doc gi-docgen')"
 makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
  pcre2-devel"
 checkdepends="xvfb-run cantarell-fonts"
@@ -18,7 +18,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GtkSourceView"
 changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9
+checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637
 
 # Package build options
 build_options="gir gtk_doc"
@@ -42,7 +42,7 @@ gtksourceview5-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0

From e44cc2514a543fb3f722dfa07b5b8a2218f62f08 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:05:14 -0700
Subject: [PATCH 60/60] gnome-calculator: update to 42.0

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index b496cf715cc4..74f68b6e6dc8 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=41.1
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="cmake gettext glib-devel itstool pkg-config vala"
-makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel
- libmpc-devel libsoup-devel libhandy1-devel"
+makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel
+ libmpc-devel libsoup-devel gtk4-devel libadwaita-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
 short_desc="GNOME calculator"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calculator"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34
+checksum=a535a14ebea58e691a4b5a085256aed060a2c3f07384ac3a3d01832332a27e4a

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

* Re: [PR PATCH] [Updated] [RFC] GNOME 42
  2022-03-24  1:01 [PR PATCH] [RFC] GNOME 42 oreo639
                   ` (9 preceding siblings ...)
  2022-03-24  2:11 ` oreo639
@ 2022-03-24  2:16 ` oreo639
  2022-03-24  2:19 ` oreo639
                   ` (270 subsequent siblings)
  281 siblings, 0 replies; 284+ messages in thread
From: oreo639 @ 2022-03-24  2:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gnome42
https://github.com/void-linux/void-packages/pull/36311

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

[CI Skip]

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

Depends on: https://github.com/void-linux/void-packages/pull/36241

Blocking libsoup3:
+ gnome-online-accounts
+ evolution-data-server

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36311.patch is attached

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

From aba55512994968bffcfb15717efcbf404b1ab3f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:09 -0700
Subject: [PATCH 01/61] xdg-desktop-portal: update to 1.14.1

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..5d9fb873dfe6 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false"
 hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
  libportal-devel"
 checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec
 
 do_check() {
 	# some tests require a dbus session

From 1f91fa7f882b3f142b70d1153c9e027a98d01d45 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 02/61] xdg-desktop-portal-gtk: update to 1.14.0

---
 srcpkgs/xdg-desktop-portal-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..597f5977cabf 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-gtk'
 pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
 
 post_install() {
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From d5628e5ff76714567ac51c06b93b98644f84084e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:49 -0700
Subject: [PATCH 03/61] xdg-desktop-portal-kde: update to 5.24.3

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 10169eb0f394..23aaba046f68 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ea5ba329468449640f8bfb2ab4c92daf2b214826 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 04/61] New package: xdg-desktop-portal-gnome-42.0.1

---
 srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..b7951deec327
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,20 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.0.1
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/tmp"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+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"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 9adee4b423b48f10180a36c4382b52556723f758 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 05/61] adwaita-icon-theme: update to 42.0

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0

From 09a20032e5b736ac1692df3a484f6a4f3ba5afc4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 06/61] at-spi2-core: update to 2.44.0

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..898d62a5e843 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.42.0
+version=2.44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
 
 # Package build options
 build_options="gir"

From c031609764ec4a984bcf19286b9790c5e9161926 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 07/61] baobab: update to 42.0

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc

From 025861edcd5287d15e99bef17346b0b56ebb6f51 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:34 -0700
Subject: [PATCH 08/61] colord-gtk: 0.3.0

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

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..87cd02b712f2 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
@@ -9,13 +9,13 @@ configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
 build_options_default="vala"

From 60b4bb6706ad317b0ac40618b5b1a2abc09afe99 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 09/61] eog: update to 42.0

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..46220222bbc7 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,20 @@
 # Template file for 'eog'
 pkgname=eog
-version=41.1
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From f502b3f3801f4f22a22b0d07dd72deca6668f1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 10/61] eog-plugins: update to 42.0

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..3eca07a155c8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,11 +1,11 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.8
+version=42.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+makedepends="eog-devel libhandy1-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
 depends="eog gsettings-desktop-schemas python3-gobject"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa
 python_version=3
 lib32disabled=yes

From d05e117f846f8141be68abac071f788c6f7de239 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:39:43 -0700
Subject: [PATCH 11/61] gfbgraph: update to 0.2.5

---
 srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
 srcpkgs/gfbgraph/template                |  8 +---
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch

diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build                   | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build               | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+   'libportal',
+   required: true,
++  version: '>= 0.5',
+   fallback: ['libportal', 'libportal_dep'],
+   default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+ 
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ 
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+   dependencies: [
+     dep_gtk,
+     dep_libportal,
++    dep_libportal_gtk3,
+     dep_lm
+   ],
+   install: true,
+-- 
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..844c47bed55d 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
 
 build_options="gir"
 build_options_default="gir"
@@ -27,10 +27,6 @@ do_check() {
 	:
 }
 
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }

From 698325b3e6f4dbb0c674ac0bdc66fb12c6bd8fb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:40:26 -0700
Subject: [PATCH 12/61] gjs: update to 1.72.0

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index b028c09437bb..7111cbbac913 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.70.1
+version=1.72.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f
+checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -35,7 +35,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da8ae7f52252f539bf1d07bb2397eba18d4fba3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 13/61] libgweather: update to 4.0.0

---
 common/shlibs                | 2 +-
 srcpkgs/libgweather/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..c967eeb38ca6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,7 +1126,7 @@ libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..429efd165b71 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,10 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"
@@ -13,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
 
 build_options="gir"
 build_options_default="gir"
@@ -21,7 +22,7 @@ build_options_default="gir"
 post_patch() {
 	# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
 	# And looks like we didn't ship it.
-	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+	vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
 }
 
 libgweather-devel_package() {

From 50fe1f4dac1efc0d7753b46eb1a1e917d16f2625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 14/61] gnome-bluetooth: update to 42.0

---
 common/shlibs                    | 1 +
 srcpkgs/gnome-bluetooth/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c967eeb38ca6..3193a11d63c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -684,6 +684,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1
 libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..35f65d377d78 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.5
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
 checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170
 
 build_options="gir"
 build_options_default="gir"

From e2d7433980ae929f5850e750e574f2a8fce60e9f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 15/61] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 3193a11d63c9..6e8ed86203a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3126,7 +3126,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From 858bf0146575594c7bd91b4958a227361995befc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 16/61] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 6e8ed86203a6..7cb67e0274e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 740ee4286c2272bf9febd8ffd79b97730bfe161c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 17/61] gcr: update to 3.41.0

---
 srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
 srcpkgs/gcr/template                         |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch

diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..2dd2a492430b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.40.0
+version=3.41.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
  libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
  $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme gnupg2"
 short_desc="GNOME crypto package"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From a9540e88b3c8779ceed233cd9506324346648259 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:54:25 -0700
Subject: [PATCH 18/61] glib-networking: update to 2.72.0

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..1893bd8eec6a 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
 make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 

From 516e3e08d4e60adf97e63645dc1b880cdd304411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:05 -0700
Subject: [PATCH 19/61] glib: update to 2.72.0

---
 .../glib/patches/disable-broken-tests.patch   | 79 -----------------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  4 +-
 3 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index c6bb8d96fadf..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
--  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..327b3231ca62 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From c919d5d886343bfc14c831f3e72734be6dcf0fbc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 20/61] gnome-autoar: update to 0.4.3

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

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
 
 build_options="gir"
 build_options_default="gir"

From 8ee8aaecb34e2597896694d0f2b8c6fbb8369a50 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 21/61] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=41.0
+version=42.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d

From bbe8e45ae58b2a16836994a6461d4ac77dc412c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 22/61] gsettings-desktop-schemas: update to 42.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 3d841c45f8a8..52b4efeb1f80 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=41.0
+version=42.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
 
 # Package build options
 build_options="gir"

From 7e69008f624655227d1451f5228095a131ea53c7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:11 -0700
Subject: [PATCH 23/61] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From dc2b0d9dcca397eb13124d420198653faf942a6b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:00:44 -0700
Subject: [PATCH 24/61] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..9f3865dde59a 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc 'gtk-doc gi-docgen') $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
@@ -47,7 +47,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From a433d96aecc91b544f2677b20ecbe8c924204f14 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:01:29 -0700
Subject: [PATCH 25/61] libsoup3: update to 3.0.5

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

diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template
index 61ed3d167f17..d0a352b7fd83 100644
--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@@ -1,6 +1,6 @@
 # Template file for 'libsoup3'
 pkgname=libsoup3
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc="libsoup-$version"
 build_style=meson
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
-checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b
+checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145
 make_check=no # gio tests can't run in chroot
 
 # Package build options

From cd3af54e431935f117c48d74cdcee1a36c86c4e7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:03:46 -0700
Subject: [PATCH 26/61] libnma: enable gtk4

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

diff --git a/common/shlibs b/common/shlibs
index 7cb67e0274e1..56e886400c5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.34_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..dc9436742db3 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.34
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"

From b53b45432723abf7e3d1d2651c53ef103a6b61ee Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:53:28 -0700
Subject: [PATCH 27/61] upower: update to 0.99.17

---
 srcpkgs/upower/template | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..34db34d424f9 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From af2a8ab7c34709df91ecb36fc1c4848cdc61067d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 28/61] yelp: update to 42.0

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..0800ea745b22 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=41.2
+version=42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
 depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,14 +15,13 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=20882556a9c5dbd3075930245e70371c6bac30eaa7a5ed09c7db127cda2013f7
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}
 }

From ab2575f0e8f355042e36b0141f76184dd6140060 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 29/61] gnome-settings-daemon: update to 42.1

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 9f8c9857eec6..d04f0b038033 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=41.0
+version=42.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From a0c6ca7f30114d3a3e29d10658c9a7eaa3a4776a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 30/61] gnome-control-center: update to 42.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..8be9bc1356c8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,10 +1,9 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=41.4
+version=42.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
@@ -12,10 +11,10 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
@@ -24,10 +23,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-
-build_options="cheese"
-build_options_default="cheese"
+checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
 
 desc_option_cheese="Add support for adding user account images with your webcam"
 

From 8da5b1964e3e83d3249ccc1ef709b0e2beff878c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 31/61] evolution-data-server: update to 3.44.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 71db33706047..6b1ab31baf72 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,11 +1,11 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.42.3
+version=3.44.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir vala)"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
 
 build_options="gir"
 build_options_default="gir"

From 689177b34c434b660e78b2c5434e4d383b9c9a64 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 32/61] gnome-desktop: update to 42.0

---
 common/shlibs                                 |   3 +
 .../patches/00_fix_build_gtk4.patch           | 162 ++++++++++++++++++
 .../patches/01_optional_introspection.patch   |  93 ++++++++++
 srcpkgs/gnome-desktop/patches/build.patch     |  18 --
 .../patches/optionalise-gir.patch             |  47 -----
 srcpkgs/gnome-desktop/template                |   6 +-
 6 files changed, 261 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
 create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
 delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch

diff --git a/common/shlibs b/common/shlibs
index 56e886400c5c..7974b6cdd848 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-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.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
new file mode 100644
index 000000000000..7f2176c5a1d7
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch
@@ -0,0 +1,162 @@
+From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 18:07:17 -0700
+Subject: [PATCH] meson: Fix build_gtk4 option
+
+---
+ libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index e81530ed..a0fb11f8 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
+   'gnome-xkb-info.h',
+ ]
+ 
+-install_headers(libgnome_desktop_base_headers,
+-  subdir: 'gnome-desktop-4.0/libgnome-desktop'
+-)
++if get_option('build_gtk4')
++  install_headers(libgnome_desktop_base_headers,
++    subdir: 'gnome-desktop-4.0/libgnome-desktop'
++  )
+ 
+-base_deps = [
+-  gdk_pixbuf_dep,
+-  glib_dep,
+-  gio_dep,
+-  gio_unix_dep,
+-  libsystemd_dep,
+-  schemas_dep,
+-  xkb_config_dep,
+-  xkbregistry_dep,
+-  iso_codes_dep,
+-  udev_dep,
+-  seccomp_dep,
+-  m_dep,
+-  rt_dep,
+-]
++  base_deps = [
++    gdk_pixbuf_dep,
++    glib_dep,
++    gio_dep,
++    gio_unix_dep,
++    libsystemd_dep,
++    schemas_dep,
++    xkb_config_dep,
++    xkbregistry_dep,
++    iso_codes_dep,
++    udev_dep,
++    seccomp_dep,
++    m_dep,
++    rt_dep,
++  ]
+ 
+-libgnome_desktop_base = library('gnome-desktop-4',
+-  sources: [
+-    libgnome_desktop_base_sources,
+-    libgnome_desktop_base_private_sources,
+-    dbus_idle_built_sources,
+-  ],
+-  dependencies: base_deps,
+-  soversion: soversion,
+-  version: libversion,
+-  c_args: libargs,
+-  link_args: base_ldflags,
+-  install: true,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base = library('gnome-desktop-4',
++    sources: [
++      libgnome_desktop_base_sources,
++      libgnome_desktop_base_private_sources,
++      dbus_idle_built_sources,
++    ],
++    dependencies: base_deps,
++    soversion: soversion,
++    version: libversion,
++    c_args: libargs,
++    link_args: base_ldflags,
++    install: true,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-  export_packages: 'gnome-desktop-4',
+-  namespace: 'GnomeDesktop',
+-  nsversion: '4.0',
+-  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+-  identifier_prefix: 'Gnome',
+-  symbol_prefix: 'gnome',
+-  install: true,
+-)
++  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++    export_packages: 'gnome-desktop-4',
++    namespace: 'GnomeDesktop',
++    nsversion: '4.0',
++    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++    identifier_prefix: 'Gnome',
++    symbol_prefix: 'gnome',
++    install: true,
++  )
+ 
+-pkg.generate(
+-  libgnome_desktop_base,
+-  requires: ['gsettings-desktop-schemas'],
+-  version: meson.project_version(),
+-  name: 'gnome-desktop-4',
+-  filebase: 'gnome-desktop-4',
+-  description: 'Utility library for GNOME desktop components',
+-  subdirs: 'gnome-desktop-4.0',
+-)
++  pkg.generate(
++    libgnome_desktop_base,
++    requires: ['gsettings-desktop-schemas'],
++    version: meson.project_version(),
++    name: 'gnome-desktop-4',
++    filebase: 'gnome-desktop-4',
++    description: 'Utility library for GNOME desktop components',
++    subdirs: 'gnome-desktop-4.0',
++  )
+ 
+-libgnome_desktop_base_dep = declare_dependency(
+-  sources: [
+-    libgnome_desktop_base_gir,
+-  ],
+-  dependencies: base_deps,
+-  link_with: libgnome_desktop_base,
+-  include_directories: [
+-    include_directories('.'),
+-    include_directories('..'),
+-  ],
+-)
++  libgnome_desktop_base_dep = declare_dependency(
++    sources: [
++      libgnome_desktop_base_gir,
++    ],
++    dependencies: base_deps,
++    link_with: libgnome_desktop_base,
++    include_directories: [
++      include_directories('.'),
++      include_directories('..'),
++    ],
++  )
+ 
+-if gtk4_dep.found()
+   subdir('gnome-bg')
+   subdir('gnome-rr')
+ endif
+-- 
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt            |  4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+     ],
+   )
+ 
+-  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+-    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+-    export_packages: 'gnome-desktop-4',
+-    namespace: 'GnomeDesktop',
+-    nsversion: '4.0',
+-    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+-    ex