Re: Update to Gnome-40

Re: Update to Gnome-40

[Gottox]

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

New comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812864610

Comment:
duplicate of #29959.

Re: Update to Gnome-40

[Oreo639]

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

New comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812888809

Comment:
I haven't tested this, but, assuming this works I have no issues with this superseding my pr. (less work for me, and my pr was simply meant to be just enough to be functional)

However I still have a few comments/questions:
You probably want to double check the mutter commit(s) as it seems a little messed up. (also double check the changes in the second mutter commit)

Doesn't gnome-shell still depend on gtk+3 as well or am I mistaken? (I didn't feel like testing since it would have taken too long)
https://github.com/GNOME/gnome-shell/blob/master/meson.build#L84

Re: Update to Gnome-40

[Oreo639]

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

New comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812888809

Comment:
I haven't tested this, but, assuming this works I have no issues with this superseding my pr. (less work for me, and my pr was simply meant to be just enough to be functional)

However I still have a few comments/questions:
You probably want to double check the mutter commit(s) as it seems a little messed up. (also double check the changes in the second mutter commit)

Doesn't gnome-shell still depend on gtk+3 as well or am I mistaken? (I didn't feel like testing since it would have taken too long)
https://github.com/GNOME/gnome-shell/blob/master/meson.build#L84
https://src.fedoraproject.org/rpms/gnome-shell/blob/rawhide/f/gnome-shell.spec#_20

Re: Update to Gnome-40

[Oreo639]

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

New comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812888809

Comment:
I haven't tested this, but, assuming this works I have no issues with this superseding my pr. (less work for me, and my pr was simply meant to be just enough to be functional)

However I still have a few comments/questions:
You probably want to double check the mutter commit(s) as it seems a little messed up. (also double check the changes in the second mutter commit)

Doesn't gnome-shell still depend on gtk+3 as well?
https://github.com/GNOME/gnome-shell/blob/master/meson.build#L84
https://src.fedoraproject.org/rpms/gnome-shell/blob/rawhide/f/gnome-shell.spec#_20

Re: Update to Gnome-40

[Oreo639]

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

New comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812888809

Comment:
I haven't tested this, but, assuming this works I have no issues with this superseding my pr. (less work for me, and my pr was simply meant to be just enough to be functional)

However I still have a few comments/questions:
You probably want to double check the mutter commit(s) as it seems a little messed up. (also double check the changes in the second mutter commit)

Doesn't gnome-shell still depend on gtk+3 as well?
https://github.com/GNOME/gnome-shell/blob/master/meson.build#L84
https://src.fedoraproject.org/rpms/gnome-shell/blob/rawhide/f/gnome-shell.spec#_55

Re: Update to Gnome-40

[Oreo639]

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

New comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812888809

Comment:
I haven't tested this, but, assuming this works I have no issues with this superseding my pr. (less work for me, and my pr was simply meant to be just enough to be functional)
Although you might want to pull in some updates from my pr as well.

However I still have a few comments/questions:
You probably want to double check the mutter commit(s) as it seems a little messed up. (also double check the changes in the second mutter commit)

Doesn't gnome-shell still depend on gtk+3 as well?
https://github.com/GNOME/gnome-shell/blob/master/meson.build#L84
https://src.fedoraproject.org/rpms/gnome-shell/blob/rawhide/f/gnome-shell.spec#_55

Re: Update to Gnome-40

[Oreo639]

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

New comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812888809

Comment:
I haven't tested this, but, assuming this works I have no issues with this superseding my pr. (less work for me, and my pr was simply meant to be just enough to be functional)

However I still have a few comments/questions:
You probably want to double check the mutter commit(s) as it seems a little messed up. (also double check the changes in the second mutter commit)

Doesn't gnome-shell still depend on gtk+3 as well?
https://github.com/GNOME/gnome-shell/blob/master/meson.build#L84
https://src.fedoraproject.org/rpms/gnome-shell/blob/rawhide/f/gnome-shell.spec#_55

Re: Update to Gnome-40

[Gottox]

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

New comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812890528

Comment:
@Oreo639 I'll rebase on you're PR once I've got the initial webkit2gtk update done.

Re: [PR PATCH] [Updated] Update to Gnome-40

[Gottox]

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

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

https://github.com/Gottox/void-packages gnome40
https://github.com/void-linux/void-packages/pull/29974

Update to Gnome-40


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

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

From b9fdafa6afac8cdbc33b4ffb0fd6e5cdb892056a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 01/78] adwaita-icon-theme: update to 40.rc.

---
 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 8ddcde9b7873..2ce6e203025c 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=3.38.0
+version=40.rc
 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=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From 2043c0eec9a093c295a3cfd799a6bb79c4e4077a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 02/78] at-spi2-core: update to 2.40.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 74e607012012..e1c601f5d816 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.38.0
+version=2.40.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=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From 91f62f9e044a66b48301e9702a935aef486b3dc9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 03/78] dconf: update to 0.40.0.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..b79822642fc3 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From 76a0f3d9f2da3fc001310d4d46fa9ec3b1a20287 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 04/78] gcr: update to 3.40.0.

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

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From 7ce065c9b7009dd9f9c89bd2b279ddcdd1d57886 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:40:04 +0200
Subject: [PATCH 05/78] gdm: update to 40.0.

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..ce851288d301 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
+version=40.0
 revision=3
 build_helper="gir"
 build_style=meson
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 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=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From 8bc652dfe1addc80e0a71af9ca14d7a47e3d7ce5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 06/78] gobject-introspection: update to 1.68.0.

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

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..b853759a9583 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 

From 47acf273f1557701526eb1867e5af1e05072cbcb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 07/78] gjs: update to 1.68.0.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..542e59df3add 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
 
 post_install() {
 	vlicense COPYING

From 8648937d4e1093fa793659bf31abd8ceb1087015 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 08/78] glib: update to 2.68.0.

---
 .../glib/patches/disable-broken-tests.patch   | 52 -------------------
 srcpkgs/glib/template                         |  4 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 15e87215d276..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
---- gio/tests/meson.build
-+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
-   endforeach
- endif
- 
--if not meson.is_cross_build() or meson.has_exe_wrapper()
-+if false
- 
-   plugin_resources_c = custom_target('plugin-resources.c',
-     input : 'test4.gresource.xml',
-diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
---- glib/tests/meson.build
-+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
-   'error' : {},
--  'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 60b97e1716d27e1b26c3ecb4391717c24aca03b2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 09/78] glib-networking: update to 2.68.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 96f312cff4d8..fdb7fbfe8d1a 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.66.0
+version=2.68.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=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From a63c83e64188be04b36059680d2e04841a6209e8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 10/78] gnome-backgrounds: update to 40.rc.

---
 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 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 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=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From 9d1595e689c9967a3df02397f16137d7ee0179d9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:01:46 +0200
Subject: [PATCH 11/78] gnome-control-center: update to 40.0.

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From eb59853d11539b6287ec835cdba46992c8cfc315 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:04:44 +0200
Subject: [PATCH 12/78] gnome-desktop: update to 40.0.

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -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=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From e87deec805ceaf3d48b37a28872b7349432b9da5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 13/78] gnome-initial-setup: update to 40.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 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=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From dac13e7b8756b23d570d441f42ed6e086e037347 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:12:07 +0200
Subject: [PATCH 14/78] gsettings-desktop-schemas: update to 40.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 76c4b0e08108..9aa049052172 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=3.38.0
+version=40.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=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From 80cd98ea5b3e94d6d3166fb9626388354eaf4b0b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 15/78] evolution-data-server: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..f89200a7b0eb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -605,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 91badd8ac077f8e778d33b195675fbb3ab569660 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 16/78] evolution: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index f89200a7b0eb..a8fcb8c37511 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From ebab5492944de51e40e40047c1c68e79996bebad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 17/78] evolution-ews: update to 3.40.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 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.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From b79f11d683972ceb43590a6b0cb70a36b6d89006 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 18/78] bijiben: update to 40.0.

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

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From 2fed6e5474e191a2ccce2e6dceae3ce65948fff0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 19/78] python3-gobject: update to 3.40.1.

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..8dc5d7a84009 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 49a9bf84b1f2c6d73d71c713beb6594bd17b599e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 20/78] libgweather: update to 40.0.

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..140f24a2c662 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,12 +1,12 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
+hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala) python3-gobject-devel"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
@@ -14,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=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From c03aec4d6a512d75979b5b4991342b1f74dfe24f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 21/78] folks: update to 0.14.0.

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From 9c2eaded24f367598e7990fa9d15a3da2643f5bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 22/78] gnome-calendar: update to 40.0.

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.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 libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-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>"
@@ -13,7 +13,7 @@ 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=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From f6bb8ad1e569bfd8a89900cf0739369e49634ef2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 23/78] gnome-contacts: update to 40.0.

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 92da8b8795105920112717ae1c43429a50bd45ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:37:07 +0200
Subject: [PATCH 24/78] mutter: update to 40.0.

---
 srcpkgs/mutter/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 70df3b8cf4be..2ac1ed05ec3c 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
 shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
  libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
 
@@ -37,9 +37,9 @@ do_check() {
 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-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 3ddc2f0d38878e32435ad5920de51024b9878532 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:36 +0200
Subject: [PATCH 25/78] mutter: update to 40.0.

---
 common/shlibs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a8fcb8c37511..d1a2e04221c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2925,15 +2925,14 @@ 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-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-7.so mutter-40.0_1
+libmutter-cogl-7.so mutter-40.0_1
+libmutter-cogl-pango-7.so mutter-40.0_1
+libmutter-cogl-path-7.so mutter-40.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

From 547933b7dbf90e1c811fbd20981f87c017b65d86 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 26/78] gnome-shell: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 97f9fe5e6c9fa4943a481e08ffc4e70eee9e7bb8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 27/78] gnome-todo: update to 3.28.1.

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

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From f5fcde4444fe0e0eb31871f57b7af810dae2c65a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 28/78] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From 0fd7a19de8647feb4dca289f3c5b0e5038578d26 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 29/78] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From 3d53bd0e7870aef7bb152b7c9ec2e9c1a3444677 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 30/78] planner: rebuild with evolution-data-server-3.40.0

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..f292438ad31f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,7 +1,7 @@
 # Template file for 'planner'
 pkgname=planner
 version=2.5.7
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"

From f69b3b5c1ddac1e7e0f52e59e6afc69bde554d42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 31/78] gnome-panel: update to 3.40.0.

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

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From 6a4e07db85c23155f43c3951915acec7b4ff5b8b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 32/78] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From 5277389deba597483478cd27730b6c334a5668e1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 33/78] gnome-user-docs: update to 40.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 a4ab3218bd75..8edb370dc144 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=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From fde7501837131d581956a58d4073a521dd523d44 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 34/78] libgdata: update to 0.18.1.

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

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From 64586424380585182b1e7c11a6832891abf6e9af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 35/78] gvfs: update to 1.48.0.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From e1c4a418266bef34943bd3f89330bd3578e20429 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 36/78] nautilus: update to 40.0.

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 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::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 2941eb481dd265931552161161483fcd3bd84ecb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 37/78] yelp-xsl: update to 40.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 88899d2ed720..3feefeb7a097 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=3.38.3
+version=40.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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From 58f12c6d30b220ab83e2350c1feaba933fcc5ccf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 38/78] yelp-tools: update to 40.0.

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -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=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From 14a98f44d7908679fe9b047b9f341cbd88740cc6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 39/78] yelp: update to 40.0.

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ 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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From c9d9c513f42419e417689e67559db80dbb801151 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:00 +0200
Subject: [PATCH 40/78] mutter: update to 40.0.

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

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 2ac1ed05ec3c..6a312acb297e 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -18,7 +18,7 @@ short_desc="Lightweight GTK+3 window manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/${pkgname}/${version%*.}/${pkgname}-${version}.tar.xz"
 checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
 shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
  libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"

From e40b26d3b804c91d8d9588017c3ed3cc374a2016 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 41/78] gnome-shell-extensions: update to 40.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 4ea740326654..ba043950982e 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=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From 61be80f9fa8786ef03729a723291cc20a659d18b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:15 +0200
Subject: [PATCH 42/78] gnome-settings-daemon: update to 40.0.

---
 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 ecc62cf27782..824529fa11db 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=3.38.1
+version=40.0
 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=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From 44c4bc827829c39ea3127d2bd5bfae2922af2a79 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 43/78] common/xbps-src: update-check checks new gnome upstream
 sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From b3ecf68f1a48b826456482ec250109056f9f436e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 44/78] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From 28b983fcd8d304793e2ec9be4582ca6dcb602bb5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 45/78] eog: update to 40.0.

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ 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=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 4560f00cdc4b39ee9ade591c42a87f561af38f5e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 46/78] evince: update to 40.1.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.2
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
  libgxps-devel libsecret-devel libspectre-devel nautilus-devel
- poppler-glib-devel gspell-devel gst-plugins-base1-devel"
+ poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
+checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From 89070686fa297fe41006f47bef028724e175b810 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 47/78] tepl: update to 6.00.0.

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

diff --git a/common/shlibs b/common/shlibs
index d1a2e04221c6..35f452041291 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3464,7 +3464,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-5.so.0 tepl-4.2.0_1
+libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 798d5cd00775..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=5.0.0
+version=6.00.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74
+checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
 
 build_options="gir"
 build_options_default="gir"

From db64ed09e5aed758fcb110f7ee68f66acd361053 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 48/78] gedit: update to 40.0.

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

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index f73d3735b645..1dd86211ba77 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
 shlib_provides="libgedit-3.38.so"
 python_version=3
 

From 2a637b088d5bf3401e9727ad19b493cd21e50390 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 49/78] gnome-disk-utility: update to 40.0.

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

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index d90f7d7d9fc4..4c94a74f037a 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,17 +1,18 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
 hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
 makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
- libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel"
+ libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
+ libhandy1-devel"
 depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
+checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897
 lib32disabled=yes

From 99e4760692d22ab40e7add40f91f2baa46a007a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 50/78] baobab: update to 40.0.

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 882155356a45..f6264797e694 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel"
+makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-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=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7

From 2bd50ce316ff08a07175e6e34e84b735dd46907a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:22 +0200
Subject: [PATCH 51/78] cheese: update to 40.0.

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

diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index faa329ee0e4a..f174034ae1af 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"

From 705506f3c5f4db107968fb5e3a05a306e17510b7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 52/78] gnome-calculator: update to 40.0.

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.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"
+ libmpc-devel libsoup-devel libhandy1-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=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

From 36799a3c007179d7e1508e861b306ef218afe365 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 53/78] gnome-characters: update to 40.0.

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

diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index ac264e51a6af..472b961b1eeb 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-characters'
 pkgname=gnome-characters
-version=3.34.0
-revision=3
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel"
+makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
 depends="gnome-desktop gjs"
 short_desc="Utility to find and insert unusual characters for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57
+checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c
 lib32disabled=yes

From 4c6bb9284f09a83e34da22cc95d4debe736fbc7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 54/78] gnome-clocks: update to 40.0.

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ 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=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

From 834aaa2c535f2ff846ec11858307b624950c38b0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 55/78] gnome-font-viewer: update to 40.0.

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

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f74fcbcb000e..92748bbb386e 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
 makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel"
+ gnome-desktop-devel harfbuzz-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
+checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42

From 2aa198d1f81fe9552bb4498fc23233dc0f30328d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 56/78] gnome-maps: update to 40.0.

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

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index fa518223ce79..04fa87106e7a 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3
+checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49

From a2c25b650f8a5557ac65c0994aa286648e482532 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 57/78] gnome-music: update to 40.0.

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

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index cba2e901581a..40244199bba1 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
+checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6
 lib32disabled=yes

From c2405510b70ca09471f8e3761e5a6ab9bfcc8b2d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 58/78] gnome-screenshot: update to 40.0.

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

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 0a5511db2173..579db2f88827 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-screenshot'
 pkgname=gnome-screenshot
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2

From 42a1f988b29a16bdc271756fcf65992ec2101b78 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 59/78] gnome-system-monitor: update to 40.0.

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

diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 069637e231c0..ecde52ba4395 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="pkg-config intltool itstool glib-devel polkit"
-makedepends="gtkmm-devel librsvg-devel libgtop-devel"
+makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SystemMonitor"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4
+checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756

From 3c6fd53a3a331a8ed52a8e2c8dbaa21b89e67d57 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 60/78] vte3: update to 0.63.91.

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

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 90278ecf1523..300f20e19e8e 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.62.1
+version=0.63.91
 revision=1
 wrksrc="vte-${version}"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d
+checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From b5f277f6c63e41722ca7d345d194990204e50197 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 61/78] gnome-terminal: update to 3.40.0.

---
 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 303ad85bdb18..4430ac709829 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.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -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=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From 1c71b567294f29b642c86c9decb8ea1ae5bf6179 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 62/78] gnome-tweaks: update to 40.0.

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

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index d07507984433..10e7a38cf566 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
+checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From d756fd7e1f9f6220ed6de82d82db9598993fb312 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 63/78] gnome-weather: update to 40.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 c028e46ba65d..f70aa2c3410e 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=3.36.1
-revision=2
+version=40.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"
+makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-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=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787
+checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef
 lib32disabled=yes

From 44f446005c56784e54f16b66447f22bc84e78909 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 64/78] gspell: update to 1.8.4.

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..ea7f4862b113 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"

From d8b507082c8a95ccd6c7f057bf508791fe7e1115 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 65/78] orca: update to 40.0.

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

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 21f6450b37d0..58c745b3d803 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,6 +1,6 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
+checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From 6fcd458b3f8135f417b5c46478b75b2cf98b2482 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 66/78] simple-scan: update to 40.0.

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

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b9df63878f87..4702a74b46b8 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,14 +1,14 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel "
+makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel"
 depends="hicolor-icon-theme sane"
 short_desc="GTK Simple scanning utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d
+checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af

From 39440f797f4d97541a805fc07cd63712e3d2f348 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:09:38 +0200
Subject: [PATCH 67/78] gedit: shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 35f452041291..040046b1b180 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3583,7 +3583,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-3.38.so gedit-3.37.3_1
+libgedit-40.0.so gedit-40.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1

From 5bff5056d149364a9ad651c3012913ccb229bbe5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 68/78] gedit-plugins: update to 40.0.

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

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index e288f0d3812b..5bbd7832900b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
+checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641
 python_version=3

From 4280cf9f3e2cb059fa4c4233359e5c1a53f05298 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 69/78] gnome-builder: update to 3.40.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 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ 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-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From 2402a22e9f4955a384b7cba88ad4e8ec957abc83 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:29 +0200
Subject: [PATCH 70/78] webkit2gtk: update to 2.32.0.

---
 .../webkit2gtk/patches/be-typedarray.patch    | 213 ------------------
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    |  40 ----
 srcpkgs/webkit2gtk/template                   |   8 +-
 3 files changed, 4 insertions(+), 257 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-typedarray.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
deleted file mode 100644
index 347728bbb92e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
-
-https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to-facebook
-
-Updated by @q66.
-
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index f08f852..53e2813 100644
---- Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-@@ -28,6 +28,7 @@
- #include "JSArrayBufferView.h"
- #include "ThrowScope.h"
- #include "ToNativeFromValue.h"
-+#include <wtf/FlipBytes.h>
- 
- namespace JSC {
- 
-@@ -147,7 +148,18 @@ public:
-     
-     JSValue getIndexQuickly(unsigned i) const
-     {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return Adaptor::toJSValue(flipBytes(getIndexQuicklyAsNativeValue(i)));
-+        }
-+#else
-         return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
-+#endif
-     }
-     
-     void setIndexQuicklyToNativeValue(unsigned i, typename Adaptor::Type value)
-@@ -164,7 +176,20 @@ public:
-     void setIndexQuickly(unsigned i, JSValue value)
-     {
-         ASSERT(!value.isObject());
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+            break;
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            setIndexQuicklyToNativeValue(i, flipBytes(toNativeFromValue<Adaptor>(value)));
-+            break;
-+        }
-+#else
-         setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+#endif
-     }
-     
-     bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -183,13 +208,54 @@ public:
-         if (i >= m_length)
-             return false;
- 
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            setIndexQuicklyToNativeValue(i, value);
-+            break;
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            setIndexQuicklyToNativeValue(i, flipBytes(value));
-+            break;
-+        }
-+#else
-         setIndexQuicklyToNativeValue(i, value);
-+#endif
-         return true;
-     }
- 
--    static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue) { return toNativeFromValue<Adaptor>(globalObject, jsValue); }
-+    static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue)
-+    {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValue<Adaptor>(globalObject, jsValue));
-+        }
-+#else
-+        return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+#endif
-+    }
- 
--    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
-+    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue)
-+    {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValueWithoutCoercion<Adaptor>(jsValue));
-+        }
-+#else
-+        return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+#endif
-+    }
- 
-     void sort()
-     {
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 5bca5d7..8a7111c 100644
---- Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -209,9 +209,36 @@ EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
-     scope.assertNoException();
-     RELEASE_ASSERT(!thisObject->isNeutered());
- 
--    if (std::isnan(static_cast<double>(*targetOption))) {
-+    double targetOptionLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+    switch (ViewClass::TypedArrayStorageType) {
-+    case TypeFloat32:
-+    case TypeFloat64:
-+        targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+    default:
-+        // typed array views are commonly expected to be little endian views of the underlying data
-+        targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+    }
-+#else
-+    targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+#endif
-+
-+    if (std::isnan(targetOptionLittleEndianAsDouble)) {
-         for (; index < length; ++index) {
--            if (std::isnan(static_cast<double>(array[index])))
-+            double arrayElementLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+            switch (ViewClass::TypedArrayStorageType) {
-+            case TypeFloat32:
-+            case TypeFloat64:
-+                arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+            default:
-+                // typed array views are commonly expected to be little endian views of the underlying data
-+                arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+            }
-+#else
-+            arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+#endif
-+            if (std::isnan(arrayElementLittleEndianAsDouble))
-                 return JSValue::encode(jsBoolean(true));
-         }
-     } else {
-diff --git Source/WTF/wtf/FlipBytes.h Source/WTF/wtf/FlipBytes.h
-index 6cd7126..24708f7 100644
---- Source/WTF/wtf/FlipBytes.h
-+++ Source/WTF/wtf/FlipBytes.h
-@@ -24,6 +24,7 @@
-  */
- 
- #pragma once
-+#include "Optional.h"
- 
- namespace WTF {
- 
-@@ -98,6 +99,42 @@ inline T flipBytes(T value)
-     return T();
- }
- 
-+template<typename T>
-+inline T flipBytes(WTF::Optional<T> value)
-+{
-+    if (sizeof(*value) == 1)
-+        return *value;
-+    if (sizeof(*value) == 2) {
-+        union {
-+            T original;
-+            uint16_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 4) {
-+        union {
-+            T original;
-+            uint32_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 8) {
-+        union {
-+            T original;
-+            uint64_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    RELEASE_ASSERT_NOT_REACHED();
-+    return T();
-+}
-+
- template<typename T>
- inline T flipBytesIfLittleEndian(T value, bool littleEndian)
- {
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
deleted file mode 100644
index 80448614717a..000000000000
--- a/srcpkgs/webkit2gtk/patches/ppc-llint.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=221710
-
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 66571beb5c60..e273c6dd28a8 100644
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1579,13 +1579,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
-     loadp StructureChain::m_vector[t3], t3
-     assert(macro (ok) btpnz t3, ok end)
- 
--    loadp Structure::m_prototype[t2], t2
-+    loadp Structure::m_prototype + PayloadOffset[t2], t2
-     btpz t2, .opPutByIdTransitionChainDone
- .opPutByIdTransitionChainLoop:
-     loadp [t3], t1
-     bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
-     addp 4, t3
--    loadp Structure::m_prototype[t1], t2
-+    loadp Structure::m_prototype + PayloadOffset[t1], t2
-     btpnz t2, .opPutByIdTransitionChainLoop
- 
- .opPutByIdTransitionChainDone:
-@@ -2251,7 +2251,7 @@ end)
- 
- 
- op(llint_throw_from_slow_path_trampoline, macro()
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
- 
-@@ -2260,7 +2260,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
-     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
-     # the throw target is not necessarily interpreted code, we come to here.
-     # This essentially emulates the JIT's throwing protocol.
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     jmp VM::targetMachinePCForThrow[t1]
- end)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 60ab9db8861f..00839744d861 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.30.6
+version=2.32.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -32,17 +32,17 @@ hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
- dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
+ dbus-glib-devel libwebp-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
- qt5-devel $(vopt_if x11 libXt-devel)
+ qt5-devel $(vopt_if x11 libXt-devel) libmanette-devel
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e
+checksum=9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"

From 16af0f7da0671cdbaa61853427c503e3770062ba Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 71/78] libvirt-glib: update to 4.0.0.

---
 srcpkgs/libvirt-glib/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..b91c6119892e 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
  python-devel $(vopt_if vala vala)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
@@ -13,8 +13,8 @@ short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
 build_options="gir vala"

From 25708c67d2c0cd94e1f1d169ff8f44cc7b3c00cc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:46 +0200
Subject: [PATCH 72/78] libmanette: update to 0.2.5.

---
 srcpkgs/libmanette/patches/time64.patch | 13 -------------
 srcpkgs/libmanette/template             |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/libmanette/patches/time64.patch

diff --git a/srcpkgs/libmanette/patches/time64.patch b/srcpkgs/libmanette/patches/time64.patch
deleted file mode 100644
index 50eec643171e..000000000000
--- a/srcpkgs/libmanette/patches/time64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/manette-device.c	2019-03-11 10:04:16.000000000 +0100
-+++ src/manette-device.c	2020-12-11 16:39:51.368792737 +0100
-@@ -415,8 +415,8 @@
-   ManetteEvent manette_event;
- 
-   manette_event.any.device = self;
--  manette_event.any.time = evdev_event->time.tv_sec * 1000 +
--                           evdev_event->time.tv_usec / 1000;
-+  manette_event.any.time = evdev_event->input_event_sec * 1000 +
-+                           evdev_event->input_event_usec / 1000;
-   manette_event.any.hardware_type = evdev_event->type;
-   manette_event.any.hardware_code = evdev_event->code;
-   manette_event.any.hardware_value = evdev_event->value;
diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index 2e9ae80e6245..c05dff01bf1c 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.2
+version=0.2.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b1b9fbaf84f1e383141a5715a2494f507e62313721ad993c39a868fc5ccf7d2
+checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From ab03079cf2c8df4deccf51b7f216242a57d1b212 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 73/78] gnome-sound-recorder: update to 40.0.

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

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2378517ae3f4..24431907839c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
+checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
 lib32disabled=yes

From 1f62b63ec9a6b7a319093538a3e959997245cbe8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 74/78] gnome-dictionary: update to 40.0.

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

diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 111d3bb484aa..15de25089c21 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.26.1
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dictionary"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5
 replaces="gnome-utils>=3.0"
 
 post_install() {

From 61db7cae92585c1ed840bd4394a401f3a7c01d24 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 75/78] gnome-boxes: update to 40.0.

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..06c2804b6870 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-boxes'
 pkgname=gnome-boxes
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,7 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
  libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
  libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
  tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy-devel"
+ libhandy1-devel tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,4 +17,4 @@ license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Boxes"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b
+checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5

From 49b097b52db313d931bfaff23a020c88eab7fc07 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 76/78] epiphany: update to 40.0.

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 7b8c824af59e..db7e343e5c9b 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ libarchive-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275
+checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844

From e993364a8696c42b897456fdc215439b0052b19d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 77/78] gnome-core: update to 40.0.

---
 srcpkgs/gnome-core/template | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 075bd15cdd37..b01b92979fae 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=3.38.0
-revision=3
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=3.38.0
- at-spi2-core>=2.38.0
+ adwaita-icon-theme>=40.rc
+ at-spi2-core>=2.40.0
  at-spi2-atk>=2.38.0
- cantarell-fonts>=0.201
- dconf>=0.36.0
- evolution-data-server>=3.38.0
+ cantarell-fonts>=0.301
+ dconf>=0.40.0
+ evolution-data-server>=3.40.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
- gdm>=3.38.0
- geocode-glib>=3.26.0
+ gcr>=40.0
+ gdm>=3.40.0
+ geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.66.0
- glib>=2.66.0
- glib-networking>=2.66.0
+ gjs>=1.68.0
+ glib>=2.68.0
+ glib-networking>=2.68.0
  gmime3>=3.2.7
- gnome-backgrounds>=3.38.0
- gnome-bluetooth>=3.34.1
+ gnome-backgrounds>=40.rc
+ gnome-bluetooth>=3.34.3
  gnome-color-manager>=3.36.0
- gnome-control-center>=3.38.0
- gnome-desktop>=3.38.0
- gnome-getting-started-docs>=3.36.2
- gnome-initial-setup>=3.38.0
- gnome-keyring>=3.36.0
+ gnome-control-center>=40.0
+ gnome-desktop>=40.0
+ gnome-initial-setup>=40.0
+ gnome-keyring>=40.0
  gnome-online-accounts>=3.38.0
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
- gnome-shell>=3.38.0
- gnome-shell-extensions>=3.38.0
+ gnome-shell>=40.0
+ gnome-shell-extensions>=40.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=3.38.0
+ gnome-user-docs>=40.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=3.38.0
- gvfs>=1.46.0
- mutter>=3.38.0
- nautilus>=3.38.0
+ gsettings-desktop-schemas>=40.0
+ gvfs>=1.48.0
+ mutter>=40.0
+ nautilus>=40.0
  sushi>=3.38.0
- tracker3>=3.0.0
- yelp>=3.38.0
+ tracker3>=3.0.2
+ yelp>=40.0
  xdg-desktop-portal-gtk>=1.8.0
  zenity>=3.32.0"

From f2a8a7eb5d7c9f48cfc03e87f4a4eebea0aa0858 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 78/78] gnome: update to 40.0.

---
 srcpkgs/gnome/template | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..4b0f96a4b019 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,69 +10,69 @@ homepage="https://www.gnome.org"
 
 depends="
  gnome-core>=${version}
- baobab>=3.38.0
+ baobab>=40.0
  cheese>=3.38.0
- eog>=3.38.0
- evince>=3.38.0
+ eog>=40.0
+ evince>=40.1
  file-roller>=3.38.0
- gedit>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
- gnome-disk-utility>=3.38.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
- gnome-screenshot>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
- gnome-tweaks>=3.34.0
- gnome-weather>=3.36.1
+ gedit>=40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-contacts>=40.0
+ gnome-disk-utility>=40.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
+ gnome-screenshot>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
+ gnome-tweaks>=40.0
+ gnome-weather>=40.0
  gsound>=1.0.2
- gspell>=1.8.3
+ gspell>=1.8.4
  mousetweaks>=3.32.0
- network-manager-applet>=1.8.2
- orca>=3.38.0
+ network-manager-applet>=1.20.0
+ orca>=40.0
  phodav>=2.5
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
- yelp-tools>=3.38.0"
+ yelp-tools>=40.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=40.0
  dconf-editor>=3.38.0
  devhelp>=3.38.0
- epiphany>=3.38.0
- evolution>=3.38.0
+ epiphany>=40.0
+ evolution>=40.0
  ghex>=3.18.4
  gitg>=3.32.1
- gedit-plugins>=3.38.0
- gnome-boxes>=3.38.0
- gnome-builder>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-dictionary>=3.26.1
- gnome-disk-utility>=3.38.0
+ gedit-plugins>=40.0
+ gnome-boxes>=40.0
+ gnome-builder>=3.40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-dictionary>=40.0
+ gnome-disk-utility>=40.0
  gnome-documents>=3.34.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
  gnome-nettool>=3.8.1
  gnome-photos>=3.38.0
  gnome-recipes>=2.0.2
- gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
+ gnome-screenshot>=40.0
+ gnome-sound-recorder>=40.0
+ gnome-system-monitor>=50.0
+ gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

Re: [PR PATCH] [Updated] Update to Gnome-40

[Gottox]

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

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

https://github.com/Gottox/void-packages gnome40
https://github.com/void-linux/void-packages/pull/29974

Update to Gnome-40


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

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

From 194af536f654585e3ff9d323474681ef19187c1a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:57:35 -0700
Subject: [PATCH 01/83] gnome-desktop: update to 40.0

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -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=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 329d4c6e25cef6e08057bf7049f9285fe8f42028 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 02/83] gsettings-desktop-schemas: update to 40.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 76c4b0e08108..9aa049052172 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=3.38.0
+version=40.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=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From de2024c75a27ce21b1fdbf44c0b0c57f6b87f808 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:00 -0700
Subject: [PATCH 03/83] gtk4: update to 4.2.0

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index b555160a6993..6c06833196bc 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,10 +29,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="colord cups broadway wayland x11 cloudproviders vulkan gir"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 983feafaba0fa2c16ce0132477de66762fe10af5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:54 -0700
Subject: [PATCH 04/83] gnome-shell: update to 40.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..f5e8fe3cdc1b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -9,7 +9,7 @@ hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 4490be84fb0ee0197fd72e8ef63b6926d547ee12 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:01:11 -0700
Subject: [PATCH 05/83] gnome-settings-daemon: update to 40.0

---
 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 ecc62cf27782..824529fa11db 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=3.38.1
+version=40.0
 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=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From ef351ef5a1821f6f50050c7a37a0770ae2445f03 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:02:03 -0700
Subject: [PATCH 06/83] gnome-session: update to 40.beta

---
 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 c9bc4930c39f..cbe15db8170b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.38.0
+version=40.beta
 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=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 924b1c2d53ea946b4034fbc23694ab9bf4ea4004 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:15 -0700
Subject: [PATCH 07/83] gdm: update to 40.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 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=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From 1c31c7dc6419191f68ec1071df456492d77fc246 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:42 -0700
Subject: [PATCH 08/83] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..eb686d848214 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 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=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From e9b164e9ba017aeedca59bb9f2ae5c392fd4f799 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:04:04 -0700
Subject: [PATCH 09/83] gnome-control-center: update to 40.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From 9e24ef147cb0b33e8cb0846f8ba54ef6ffccb047 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:06:05 -0700
Subject: [PATCH 10/83] mutter: update to 40.0

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

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..d11b8ecf4168 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2924,15 +2924,13 @@ 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-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.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 70df3b8cf4be..fc91fe74d4e0 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -19,9 +19,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so libmutter-cogl-pango-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +36,9 @@ do_check() {
 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-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +48,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From e5aa41b3b78dd70728d8d113f55ef9f717b859dc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 11/83] adwaita-icon-theme: update to 40.rc.

---
 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 8ddcde9b7873..2ce6e203025c 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=3.38.0
+version=40.rc
 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=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From 568ceeafd251a0acb59f34bf3d1c19d08d0efccf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 12/83] at-spi2-core: update to 2.40.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 74e607012012..e1c601f5d816 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.38.0
+version=2.40.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=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From 91a5492e33ea7866aa02c8b21e036f1f9c1bd06c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 13/83] dconf: update to 0.40.0.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..b79822642fc3 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From 3babadbea212b132e0d77b810c2d0e9eb430cb41 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 14/83] gcr: update to 3.40.0.

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

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From f5fa9e0bc6317a17eb036b2713f73210c81a186a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 15/83] gobject-introspection: update to 1.68.0.

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

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..b853759a9583 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 

From f2a7f16b03e6071afb269022ee575a794e66a11e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 16/83] gjs: update to 1.68.0.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..542e59df3add 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
 
 post_install() {
 	vlicense COPYING

From 9bd1139014f1436a2b94fca560fee9eaf1631c18 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 17/83] glib: update to 2.68.0.

---
 .../glib/patches/disable-broken-tests.patch   | 52 -------------------
 srcpkgs/glib/template                         |  4 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 15e87215d276..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
---- gio/tests/meson.build
-+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
-   endforeach
- endif
- 
--if not meson.is_cross_build() or meson.has_exe_wrapper()
-+if false
- 
-   plugin_resources_c = custom_target('plugin-resources.c',
-     input : 'test4.gresource.xml',
-diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
---- glib/tests/meson.build
-+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
-   'error' : {},
--  'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From f0161aa7cfb70c4c574169a523574ef3ee3b03ae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 18/83] glib-networking: update to 2.68.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 96f312cff4d8..fdb7fbfe8d1a 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.66.0
+version=2.68.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=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From 8634daeb877dfccdb50505cab362f0be65a983b5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 19/83] gnome-backgrounds: update to 40.rc.

---
 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 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 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=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From c2f9daf3fa3524ac6778a0fffc11c8969e8e99bc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 20/83] gnome-initial-setup: update to 40.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 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=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From f0b0f8bcc7fbd891d54fa4ebe9ffc31c4ed3a8b5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 21/83] evolution-data-server: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index d11b8ecf4168..d046c31d1a10 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -605,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 56afa27c3e9aa06512396a395ec810aca4709c53 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 22/83] evolution: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index d046c31d1a10..ef11e9b8ae1b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From 4b2af19ae309d86afc3c5ce8b9290919817489bc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 23/83] evolution-ews: update to 3.40.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 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.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From f0b3cf140015d5e4b706be5c07bd542da6ba7144 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 24/83] bijiben: update to 40.0.

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

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From cecd5fc00dceebdf1ef00dc3d97ae776981c1102 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 25/83] python3-gobject: update to 3.40.1.

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..8dc5d7a84009 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 759b44823e7cba26c689f1b009e113e2bfa393b6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 26/83] libgweather: update to 40.0.

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index eb686d848214..140f24a2c662 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -6,8 +6,8 @@ build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
+hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala) python3-gobject-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 782dd54a7ff4fd7b4f605a37327bde2446f18ef1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 27/83] folks: update to 0.14.0.

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From 0b7a47c84ea316bb4e8d1e02a44f662c3dbceb82 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 28/83] gnome-calendar: update to 40.0.

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.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 libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-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>"
@@ -13,7 +13,7 @@ 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=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From 1392a0a43709c4d793e4c10a0076c223882ec069 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 29/83] gnome-contacts: update to 40.0.

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 9360c482b8ef52f3fc0a803716fa91ad28181827 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:37:07 +0200
Subject: [PATCH 30/83] mutter: update to 40.0.

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

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index fc91fe74d4e0..2dda2e7ca574 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -20,7 +20,8 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
-shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so libmutter-cogl-pango-8.so"
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so libmutter-cogl-path-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja

From 4fd1403f4e2603efe6f97e72df27fc461278f66e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:36 +0200
Subject: [PATCH 31/83] mutter: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index ef11e9b8ae1b..a43d3db59865 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2932,6 +2932,14 @@ libmutter-cogl-8.so mutter-40.0_1
 libmutter-cogl-8.so.0 mutter-40.0_1
 libmutter-cogl-pango-8.so mutter-40.0_1
 libmutter-cogl-pango-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-7.so mutter-40.0_1
+libmutter-cogl-7.so mutter-40.0_1
+libmutter-cogl-pango-7.so mutter-40.0_1
+libmutter-cogl-path-7.so mutter-40.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

From 2143065e80af0b5d7a564de7b552c7f00ca4d93f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 32/83] gnome-shell: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f5e8fe3cdc1b..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -5,11 +5,11 @@ revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,7 +19,7 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 

From a32f86d26fd615a05b0058398090af2fbd56179e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 33/83] gnome-todo: update to 3.28.1.

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

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From a04ee7d9cbda3092f40e94ae2384c7c431a41af2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 34/83] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From afe69c087b85010b1ab13898b06d1826fea851a5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 35/83] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From 4f1408757cd7514c3e31427208691945caf45f9a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 36/83] planner: rebuild with evolution-data-server-3.40.0

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..f292438ad31f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,7 +1,7 @@
 # Template file for 'planner'
 pkgname=planner
 version=2.5.7
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"

From 87e440fa22ab4d41f28187f795753f2082f46b0a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 37/83] gnome-panel: update to 3.40.0.

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

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From d06a67bbc908f208e6f6fb5e9118555eccef0b7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 38/83] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From 94897878b8205a7b0656fb0be1030a6320824d0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 39/83] gnome-user-docs: update to 40.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 a4ab3218bd75..8edb370dc144 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=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From b13f5e5a59e544df2bdec764882d5a6ba882e354 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 40/83] libgdata: update to 0.18.1.

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

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From 7f0b35f95378345d534768e041fa7e548f785538 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 41/83] gvfs: update to 1.48.0.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From cf502c511c25ca955ef48a9bdf1c407da2134948 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 42/83] nautilus: update to 40.0.

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 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::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 4186eec2aea98aaaef6945757baeffa17a78be02 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 43/83] yelp-xsl: update to 40.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 88899d2ed720..3feefeb7a097 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=3.38.3
+version=40.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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From 97932aadf889d6e10fd13acbfb8010eb95bb783f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 44/83] yelp-tools: update to 40.0.

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -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=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From dd5979aca680b7747e545d1cd323e3dcfd141c38 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 45/83] yelp: update to 40.0.

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ 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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From 04047c8d1c31e9ed17e41108d218e0fe61037b71 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:00 +0200
Subject: [PATCH 46/83] mutter: update to 40.0.

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

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 2dda2e7ca574..bd08fd8091f7 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -18,7 +18,7 @@ short_desc="Lightweight GTK+3 window manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/${pkgname}/${version%*.}/${pkgname}-${version}.tar.xz"
 checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
 shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
  libmutter-cogl-pango-8.so libmutter-cogl-path-8.so"

From 22582fe91fd38296fbfb2aa6089ee47b23d15a11 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 47/83] gnome-shell-extensions: update to 40.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 4ea740326654..ba043950982e 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=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From 2c7434b044f3bcad38ce724eecee6379a3ff599d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 48/83] common/xbps-src: update-check checks new gnome upstream
 sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From 449afdfbca996e2e2af82fcff04d64b2facc38eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 49/83] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From 66d6236f00fda30ca354e40a9762d9e94c77ffa9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 50/83] eog: update to 40.0.

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ 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=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 9ab9468cf95c861e438d668eb68bf19323b90a26 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 51/83] evince: update to 40.1.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.2
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
  libgxps-devel libsecret-devel libspectre-devel nautilus-devel
- poppler-glib-devel gspell-devel gst-plugins-base1-devel"
+ poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
+checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From da7e91bfe7aa88538a28d1e8c6021cae15877e99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 52/83] tepl: update to 6.00.0.

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

diff --git a/common/shlibs b/common/shlibs
index a43d3db59865..5ad6498f149f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3471,7 +3471,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-5.so.0 tepl-4.2.0_1
+libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 798d5cd00775..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=5.0.0
+version=6.00.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74
+checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
 
 build_options="gir"
 build_options_default="gir"

From fef927eeaba0372f41cd1d2a1a6b664b6b970cfb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 53/83] gedit: update to 40.0.

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

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index f73d3735b645..1dd86211ba77 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
 shlib_provides="libgedit-3.38.so"
 python_version=3
 

From 7bca0befac15740314fd1cf37ee9ba6fb759a79d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 54/83] gnome-disk-utility: update to 40.0.

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

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index d90f7d7d9fc4..4c94a74f037a 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,17 +1,18 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
 hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
 makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
- libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel"
+ libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
+ libhandy1-devel"
 depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
+checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897
 lib32disabled=yes

From 9947e56067ebe604f2c426aef3cec87cc09c4e02 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 55/83] baobab: update to 40.0.

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 882155356a45..f6264797e694 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel"
+makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-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=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7

From 2d6c4279716c3bf8d157ec5649877728e827b310 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:22 +0200
Subject: [PATCH 56/83] cheese: update to 40.0.

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

diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index faa329ee0e4a..f174034ae1af 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"

From 1f69b7a7a088cbc46dd4824b680b944f61fb7ab9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 57/83] gnome-calculator: update to 40.0.

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.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"
+ libmpc-devel libsoup-devel libhandy1-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=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

From 4aed06745ec43b400449c3d41e8c0c965683cb1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 58/83] gnome-characters: update to 40.0.

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

diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index ac264e51a6af..472b961b1eeb 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-characters'
 pkgname=gnome-characters
-version=3.34.0
-revision=3
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel"
+makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
 depends="gnome-desktop gjs"
 short_desc="Utility to find and insert unusual characters for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57
+checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c
 lib32disabled=yes

From 0205b663f9de29a40055c2c5e7ccb54c5842d5d9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 59/83] gnome-clocks: update to 40.0.

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ 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=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

From 5dffabf35fc0eca67fb81163500ac56d00d2a563 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 60/83] gnome-font-viewer: update to 40.0.

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

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f74fcbcb000e..92748bbb386e 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
 makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel"
+ gnome-desktop-devel harfbuzz-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
+checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42

From b1fabfd9393522a2f76b4c2a72c9b9826c9451ec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 61/83] gnome-maps: update to 40.0.

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

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index fa518223ce79..04fa87106e7a 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3
+checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49

From dc9f251caa2e789835f3d5072563d95a0256e35d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 62/83] gnome-music: update to 40.0.

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

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index cba2e901581a..40244199bba1 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
+checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6
 lib32disabled=yes

From e2de6585f7fcb6496e4d70f2242a3d0cc5e0d156 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 63/83] gnome-screenshot: update to 40.0.

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

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 0a5511db2173..579db2f88827 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-screenshot'
 pkgname=gnome-screenshot
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2

From 260bef70f007f27bc15de50888a717d9eee29c11 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 64/83] gnome-system-monitor: update to 40.0.

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

diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 069637e231c0..ecde52ba4395 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="pkg-config intltool itstool glib-devel polkit"
-makedepends="gtkmm-devel librsvg-devel libgtop-devel"
+makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SystemMonitor"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4
+checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756

From 647caf7ce67b075f3b342a8e1d6801e71879c21c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 65/83] vte3: update to 0.63.91.

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

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 90278ecf1523..300f20e19e8e 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.62.1
+version=0.63.91
 revision=1
 wrksrc="vte-${version}"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d
+checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 7ecde0044478d44e5d5982d0b8549a6d5e9df2e9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 66/83] gnome-terminal: update to 3.40.0.

---
 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 303ad85bdb18..4430ac709829 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.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -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=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From fb153f586c34787e97c394abc9ca817878ff6ca9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 67/83] gnome-tweaks: update to 40.0.

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

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index d07507984433..10e7a38cf566 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
+checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From 784f4bb24280e890bca53a0828b386183f06a2cf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 68/83] gnome-weather: update to 40.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 c028e46ba65d..f70aa2c3410e 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=3.36.1
-revision=2
+version=40.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"
+makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-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=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787
+checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef
 lib32disabled=yes

From b11af9a98ea2b26ffe51d040a9f72023a5fc8b8d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 69/83] gspell: update to 1.8.4.

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..ea7f4862b113 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"

From e16f3e1b62bbee6df88855c587ee4d41b9afda7d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 70/83] orca: update to 40.0.

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

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 21f6450b37d0..58c745b3d803 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,6 +1,6 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
+checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From 22872a3014fe9ade8bd16b8b0220967c16699886 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 71/83] simple-scan: update to 40.0.

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

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b9df63878f87..4702a74b46b8 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,14 +1,14 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel "
+makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel"
 depends="hicolor-icon-theme sane"
 short_desc="GTK Simple scanning utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d
+checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af

From 1be0024bc6356137adea8ed610f5abe4b596fcee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:09:38 +0200
Subject: [PATCH 72/83] gedit: shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 5ad6498f149f..bd344405ca24 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3590,7 +3590,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-3.38.so gedit-3.37.3_1
+libgedit-40.0.so gedit-40.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1

From 93e9f6afbedfab908aaf159097bae5fdd1f21062 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 73/83] gedit-plugins: update to 40.0.

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

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index e288f0d3812b..5bbd7832900b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
+checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641
 python_version=3

From 9d2e82e3095b14ba0449c4110a208956cdd16e2d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 74/83] gnome-builder: update to 3.40.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 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ 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-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From 061324d122a7d148f6d31fdaa03bfc3b736c5682 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:29 +0200
Subject: [PATCH 75/83] webkit2gtk: update to 2.32.0.

---
 .../webkit2gtk/patches/be-typedarray.patch    | 213 ------------------
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    |  40 ----
 srcpkgs/webkit2gtk/template                   |   8 +-
 3 files changed, 4 insertions(+), 257 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-typedarray.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
deleted file mode 100644
index 347728bbb92e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
-
-https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to-facebook
-
-Updated by @q66.
-
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index f08f852..53e2813 100644
---- Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-@@ -28,6 +28,7 @@
- #include "JSArrayBufferView.h"
- #include "ThrowScope.h"
- #include "ToNativeFromValue.h"
-+#include <wtf/FlipBytes.h>
- 
- namespace JSC {
- 
-@@ -147,7 +148,18 @@ public:
-     
-     JSValue getIndexQuickly(unsigned i) const
-     {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return Adaptor::toJSValue(flipBytes(getIndexQuicklyAsNativeValue(i)));
-+        }
-+#else
-         return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
-+#endif
-     }
-     
-     void setIndexQuicklyToNativeValue(unsigned i, typename Adaptor::Type value)
-@@ -164,7 +176,20 @@ public:
-     void setIndexQuickly(unsigned i, JSValue value)
-     {
-         ASSERT(!value.isObject());
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+            break;
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            setIndexQuicklyToNativeValue(i, flipBytes(toNativeFromValue<Adaptor>(value)));
-+            break;
-+        }
-+#else
-         setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+#endif
-     }
-     
-     bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -183,13 +208,54 @@ public:
-         if (i >= m_length)
-             return false;
- 
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            setIndexQuicklyToNativeValue(i, value);
-+            break;
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            setIndexQuicklyToNativeValue(i, flipBytes(value));
-+            break;
-+        }
-+#else
-         setIndexQuicklyToNativeValue(i, value);
-+#endif
-         return true;
-     }
- 
--    static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue) { return toNativeFromValue<Adaptor>(globalObject, jsValue); }
-+    static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue)
-+    {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValue<Adaptor>(globalObject, jsValue));
-+        }
-+#else
-+        return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+#endif
-+    }
- 
--    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
-+    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue)
-+    {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValueWithoutCoercion<Adaptor>(jsValue));
-+        }
-+#else
-+        return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+#endif
-+    }
- 
-     void sort()
-     {
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 5bca5d7..8a7111c 100644
---- Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -209,9 +209,36 @@ EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
-     scope.assertNoException();
-     RELEASE_ASSERT(!thisObject->isNeutered());
- 
--    if (std::isnan(static_cast<double>(*targetOption))) {
-+    double targetOptionLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+    switch (ViewClass::TypedArrayStorageType) {
-+    case TypeFloat32:
-+    case TypeFloat64:
-+        targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+    default:
-+        // typed array views are commonly expected to be little endian views of the underlying data
-+        targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+    }
-+#else
-+    targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+#endif
-+
-+    if (std::isnan(targetOptionLittleEndianAsDouble)) {
-         for (; index < length; ++index) {
--            if (std::isnan(static_cast<double>(array[index])))
-+            double arrayElementLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+            switch (ViewClass::TypedArrayStorageType) {
-+            case TypeFloat32:
-+            case TypeFloat64:
-+                arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+            default:
-+                // typed array views are commonly expected to be little endian views of the underlying data
-+                arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+            }
-+#else
-+            arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+#endif
-+            if (std::isnan(arrayElementLittleEndianAsDouble))
-                 return JSValue::encode(jsBoolean(true));
-         }
-     } else {
-diff --git Source/WTF/wtf/FlipBytes.h Source/WTF/wtf/FlipBytes.h
-index 6cd7126..24708f7 100644
---- Source/WTF/wtf/FlipBytes.h
-+++ Source/WTF/wtf/FlipBytes.h
-@@ -24,6 +24,7 @@
-  */
- 
- #pragma once
-+#include "Optional.h"
- 
- namespace WTF {
- 
-@@ -98,6 +99,42 @@ inline T flipBytes(T value)
-     return T();
- }
- 
-+template<typename T>
-+inline T flipBytes(WTF::Optional<T> value)
-+{
-+    if (sizeof(*value) == 1)
-+        return *value;
-+    if (sizeof(*value) == 2) {
-+        union {
-+            T original;
-+            uint16_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 4) {
-+        union {
-+            T original;
-+            uint32_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 8) {
-+        union {
-+            T original;
-+            uint64_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    RELEASE_ASSERT_NOT_REACHED();
-+    return T();
-+}
-+
- template<typename T>
- inline T flipBytesIfLittleEndian(T value, bool littleEndian)
- {
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
deleted file mode 100644
index 80448614717a..000000000000
--- a/srcpkgs/webkit2gtk/patches/ppc-llint.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=221710
-
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 66571beb5c60..e273c6dd28a8 100644
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1579,13 +1579,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
-     loadp StructureChain::m_vector[t3], t3
-     assert(macro (ok) btpnz t3, ok end)
- 
--    loadp Structure::m_prototype[t2], t2
-+    loadp Structure::m_prototype + PayloadOffset[t2], t2
-     btpz t2, .opPutByIdTransitionChainDone
- .opPutByIdTransitionChainLoop:
-     loadp [t3], t1
-     bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
-     addp 4, t3
--    loadp Structure::m_prototype[t1], t2
-+    loadp Structure::m_prototype + PayloadOffset[t1], t2
-     btpnz t2, .opPutByIdTransitionChainLoop
- 
- .opPutByIdTransitionChainDone:
-@@ -2251,7 +2251,7 @@ end)
- 
- 
- op(llint_throw_from_slow_path_trampoline, macro()
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
- 
-@@ -2260,7 +2260,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
-     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
-     # the throw target is not necessarily interpreted code, we come to here.
-     # This essentially emulates the JIT's throwing protocol.
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     jmp VM::targetMachinePCForThrow[t1]
- end)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 60ab9db8861f..00839744d861 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.30.6
+version=2.32.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -32,17 +32,17 @@ hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
- dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
+ dbus-glib-devel libwebp-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
- qt5-devel $(vopt_if x11 libXt-devel)
+ qt5-devel $(vopt_if x11 libXt-devel) libmanette-devel
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e
+checksum=9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"

From 5efd45e04bd783aa24b679661f594af7c333821a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 76/83] libvirt-glib: update to 4.0.0.

---
 srcpkgs/libvirt-glib/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..b91c6119892e 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
  python-devel $(vopt_if vala vala)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
@@ -13,8 +13,8 @@ short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
 build_options="gir vala"

From 3cac24261dbc867ef0d84a08f09a0d130a3c130d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:46 +0200
Subject: [PATCH 77/83] libmanette: update to 0.2.5.

---
 srcpkgs/libmanette/patches/time64.patch | 13 -------------
 srcpkgs/libmanette/template             |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/libmanette/patches/time64.patch

diff --git a/srcpkgs/libmanette/patches/time64.patch b/srcpkgs/libmanette/patches/time64.patch
deleted file mode 100644
index 50eec643171e..000000000000
--- a/srcpkgs/libmanette/patches/time64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/manette-device.c	2019-03-11 10:04:16.000000000 +0100
-+++ src/manette-device.c	2020-12-11 16:39:51.368792737 +0100
-@@ -415,8 +415,8 @@
-   ManetteEvent manette_event;
- 
-   manette_event.any.device = self;
--  manette_event.any.time = evdev_event->time.tv_sec * 1000 +
--                           evdev_event->time.tv_usec / 1000;
-+  manette_event.any.time = evdev_event->input_event_sec * 1000 +
-+                           evdev_event->input_event_usec / 1000;
-   manette_event.any.hardware_type = evdev_event->type;
-   manette_event.any.hardware_code = evdev_event->code;
-   manette_event.any.hardware_value = evdev_event->value;
diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index 2e9ae80e6245..c05dff01bf1c 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.2
+version=0.2.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b1b9fbaf84f1e383141a5715a2494f507e62313721ad993c39a868fc5ccf7d2
+checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From 07ebc8917d08a8a366efa9fd70c0fd7e57b025dc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 78/83] gnome-sound-recorder: update to 40.0.

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

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2378517ae3f4..24431907839c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
+checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
 lib32disabled=yes

From 2440404387f3cdc80f0ce8ffcba73cca8ff12a30 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 79/83] gnome-dictionary: update to 40.0.

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

diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 111d3bb484aa..15de25089c21 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.26.1
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dictionary"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5
 replaces="gnome-utils>=3.0"
 
 post_install() {

From 24c404560988cde98140756de5935be1be4b9322 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 80/83] gnome-boxes: update to 40.0.

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..06c2804b6870 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-boxes'
 pkgname=gnome-boxes
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,7 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
  libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
  libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
  tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy-devel"
+ libhandy1-devel tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,4 +17,4 @@ license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Boxes"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b
+checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5

From 9c54a589645e26fee7ec64839d47e9ffd2cf6a35 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 81/83] epiphany: update to 40.0.

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 7b8c824af59e..db7e343e5c9b 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ libarchive-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275
+checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844

From f95fcb17e64a4ca2f54bd5b8f5f9997668e1873f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 82/83] gnome-core: update to 40.0.

---
 srcpkgs/gnome-core/template | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 075bd15cdd37..b01b92979fae 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=3.38.0
-revision=3
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=3.38.0
- at-spi2-core>=2.38.0
+ adwaita-icon-theme>=40.rc
+ at-spi2-core>=2.40.0
  at-spi2-atk>=2.38.0
- cantarell-fonts>=0.201
- dconf>=0.36.0
- evolution-data-server>=3.38.0
+ cantarell-fonts>=0.301
+ dconf>=0.40.0
+ evolution-data-server>=3.40.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
- gdm>=3.38.0
- geocode-glib>=3.26.0
+ gcr>=40.0
+ gdm>=3.40.0
+ geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.66.0
- glib>=2.66.0
- glib-networking>=2.66.0
+ gjs>=1.68.0
+ glib>=2.68.0
+ glib-networking>=2.68.0
  gmime3>=3.2.7
- gnome-backgrounds>=3.38.0
- gnome-bluetooth>=3.34.1
+ gnome-backgrounds>=40.rc
+ gnome-bluetooth>=3.34.3
  gnome-color-manager>=3.36.0
- gnome-control-center>=3.38.0
- gnome-desktop>=3.38.0
- gnome-getting-started-docs>=3.36.2
- gnome-initial-setup>=3.38.0
- gnome-keyring>=3.36.0
+ gnome-control-center>=40.0
+ gnome-desktop>=40.0
+ gnome-initial-setup>=40.0
+ gnome-keyring>=40.0
  gnome-online-accounts>=3.38.0
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
- gnome-shell>=3.38.0
- gnome-shell-extensions>=3.38.0
+ gnome-shell>=40.0
+ gnome-shell-extensions>=40.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=3.38.0
+ gnome-user-docs>=40.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=3.38.0
- gvfs>=1.46.0
- mutter>=3.38.0
- nautilus>=3.38.0
+ gsettings-desktop-schemas>=40.0
+ gvfs>=1.48.0
+ mutter>=40.0
+ nautilus>=40.0
  sushi>=3.38.0
- tracker3>=3.0.0
- yelp>=3.38.0
+ tracker3>=3.0.2
+ yelp>=40.0
  xdg-desktop-portal-gtk>=1.8.0
  zenity>=3.32.0"

From 28d5bbcfc4e9a694da05a846911f39f21e565ce9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 83/83] gnome: update to 40.0.

---
 srcpkgs/gnome/template | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..4b0f96a4b019 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,69 +10,69 @@ homepage="https://www.gnome.org"
 
 depends="
  gnome-core>=${version}
- baobab>=3.38.0
+ baobab>=40.0
  cheese>=3.38.0
- eog>=3.38.0
- evince>=3.38.0
+ eog>=40.0
+ evince>=40.1
  file-roller>=3.38.0
- gedit>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
- gnome-disk-utility>=3.38.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
- gnome-screenshot>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
- gnome-tweaks>=3.34.0
- gnome-weather>=3.36.1
+ gedit>=40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-contacts>=40.0
+ gnome-disk-utility>=40.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
+ gnome-screenshot>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
+ gnome-tweaks>=40.0
+ gnome-weather>=40.0
  gsound>=1.0.2
- gspell>=1.8.3
+ gspell>=1.8.4
  mousetweaks>=3.32.0
- network-manager-applet>=1.8.2
- orca>=3.38.0
+ network-manager-applet>=1.20.0
+ orca>=40.0
  phodav>=2.5
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
- yelp-tools>=3.38.0"
+ yelp-tools>=40.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=40.0
  dconf-editor>=3.38.0
  devhelp>=3.38.0
- epiphany>=3.38.0
- evolution>=3.38.0
+ epiphany>=40.0
+ evolution>=40.0
  ghex>=3.18.4
  gitg>=3.32.1
- gedit-plugins>=3.38.0
- gnome-boxes>=3.38.0
- gnome-builder>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-dictionary>=3.26.1
- gnome-disk-utility>=3.38.0
+ gedit-plugins>=40.0
+ gnome-boxes>=40.0
+ gnome-builder>=3.40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-dictionary>=40.0
+ gnome-disk-utility>=40.0
  gnome-documents>=3.34.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
  gnome-nettool>=3.8.1
  gnome-photos>=3.38.0
  gnome-recipes>=2.0.2
- gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
+ gnome-screenshot>=40.0
+ gnome-sound-recorder>=40.0
+ gnome-system-monitor>=50.0
+ gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

Re: [PR PATCH] [Updated] Update to Gnome-40

[Gottox]

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

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

https://github.com/Gottox/void-packages gnome40
https://github.com/void-linux/void-packages/pull/29974

Update to Gnome-40


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

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

From 194af536f654585e3ff9d323474681ef19187c1a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:57:35 -0700
Subject: [PATCH 01/79] gnome-desktop: update to 40.0

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -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=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 329d4c6e25cef6e08057bf7049f9285fe8f42028 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 02/79] gsettings-desktop-schemas: update to 40.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 76c4b0e08108..9aa049052172 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=3.38.0
+version=40.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=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From de2024c75a27ce21b1fdbf44c0b0c57f6b87f808 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:00 -0700
Subject: [PATCH 03/79] gtk4: update to 4.2.0

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index b555160a6993..6c06833196bc 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,10 +29,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="colord cups broadway wayland x11 cloudproviders vulkan gir"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 983feafaba0fa2c16ce0132477de66762fe10af5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:54 -0700
Subject: [PATCH 04/79] gnome-shell: update to 40.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..f5e8fe3cdc1b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -9,7 +9,7 @@ hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 4490be84fb0ee0197fd72e8ef63b6926d547ee12 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:01:11 -0700
Subject: [PATCH 05/79] gnome-settings-daemon: update to 40.0

---
 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 ecc62cf27782..824529fa11db 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=3.38.1
+version=40.0
 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=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From ef351ef5a1821f6f50050c7a37a0770ae2445f03 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:02:03 -0700
Subject: [PATCH 06/79] gnome-session: update to 40.beta

---
 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 c9bc4930c39f..cbe15db8170b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.38.0
+version=40.beta
 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=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 924b1c2d53ea946b4034fbc23694ab9bf4ea4004 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:15 -0700
Subject: [PATCH 07/79] gdm: update to 40.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 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=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From 1c31c7dc6419191f68ec1071df456492d77fc246 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:42 -0700
Subject: [PATCH 08/79] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..eb686d848214 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 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=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From e9b164e9ba017aeedca59bb9f2ae5c392fd4f799 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:04:04 -0700
Subject: [PATCH 09/79] gnome-control-center: update to 40.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From 1ff7e23e85665e5efbb5610d1de805252f67d21a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:06:05 -0700
Subject: [PATCH 10/79] mutter: update to 40.0

---
 common/shlibs           | 20 +++++++++++---------
 srcpkgs/mutter/template | 18 +++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..dec1fe40b517 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2924,15 +2924,17 @@ 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-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-8.so.0 mutter-40.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 70df3b8cf4be..bd08fd8091f7 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,10 +18,10 @@ short_desc="Lightweight GTK+3 window manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+distfiles="${GNOME_SITE}/${pkgname}/${version%*.}/${pkgname}-${version}.tar.xz"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so libmutter-cogl-path-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +37,9 @@ do_check() {
 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-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 1976377678d77a3056ee0680b9b0d7305be4fb57 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 11/79] adwaita-icon-theme: update to 40.rc.

---
 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 8ddcde9b7873..2ce6e203025c 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=3.38.0
+version=40.rc
 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=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From 856614e830baa8998a2007c5a86b375bfb76f895 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 12/79] at-spi2-core: update to 2.40.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 74e607012012..e1c601f5d816 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.38.0
+version=2.40.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=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From 14fcabe3245601b6ecdecfc16e73ff67132767db Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 13/79] dconf: update to 0.40.0.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..b79822642fc3 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From 77ea8795756bc6c9a7f7fca011d8b55c2e5aa867 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 14/79] gcr: update to 3.40.0.

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

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From 6860d81cb441826c62bb6e288236fbc698485d6e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 15/79] gobject-introspection: update to 1.68.0.

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

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..b853759a9583 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 

From d20fd8c6aa43e72b59984b4696054bfcf5a34240 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 16/79] gjs: update to 1.68.0.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..542e59df3add 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
 
 post_install() {
 	vlicense COPYING

From 7c693c13ca9aa8a59f93ac4a3c29a3ac0c417a3a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 17/79] glib: update to 2.68.0.

---
 .../glib/patches/disable-broken-tests.patch   | 52 -------------------
 srcpkgs/glib/template                         |  4 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 15e87215d276..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
---- gio/tests/meson.build
-+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
-   endforeach
- endif
- 
--if not meson.is_cross_build() or meson.has_exe_wrapper()
-+if false
- 
-   plugin_resources_c = custom_target('plugin-resources.c',
-     input : 'test4.gresource.xml',
-diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
---- glib/tests/meson.build
-+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
-   'error' : {},
--  'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 9d639c741d3041c189902c906972c9d9b7dcbe85 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 18/79] glib-networking: update to 2.68.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 96f312cff4d8..fdb7fbfe8d1a 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.66.0
+version=2.68.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=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From 4cd1f6b5ffffa48e0d1a7d3e2845a98c11ccbcc2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 19/79] gnome-backgrounds: update to 40.rc.

---
 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 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 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=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From 85abf6103332b664a6ed84f6675dc4195fa81552 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 20/79] gnome-initial-setup: update to 40.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 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=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From 565aff92d2babda312cb59359f13950c71f88aa9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 21/79] evolution-data-server: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index dec1fe40b517..35d0271d07ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -605,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 3765fe5f4c6027ba710265ecdd4818cb2af17436 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 22/79] evolution: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index 35d0271d07ae..ff26e1de294a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From dba4b4d98f88aa5070265123a72648d4034f3fe8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 23/79] evolution-ews: update to 3.40.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 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.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From bb6aa4017bccfaf17592d2aefa03bee3b9f6844c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 24/79] bijiben: update to 40.0.

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

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From 3261862e49e61cd606d154a23d99478bf6587739 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 25/79] python3-gobject: update to 3.40.1.

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..8dc5d7a84009 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 5537d4729080386acd256d4261b0e3b783f1675d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 26/79] libgweather: update to 40.0.

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index eb686d848214..140f24a2c662 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -6,8 +6,8 @@ build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
+hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala) python3-gobject-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 1b619afb660744dcda56c240d40174613bb7ca43 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 27/79] folks: update to 0.14.0.

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From a238cd7e78f626d231e7f25edc029c356bd83594 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 28/79] gnome-calendar: update to 40.0.

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.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 libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-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>"
@@ -13,7 +13,7 @@ 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=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From 3b2810c5967aae7a113ee5366801ca4cbaef151b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 29/79] gnome-contacts: update to 40.0.

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 2769376ec09aa128907078cd96d498892795a042 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 30/79] gnome-shell: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f5e8fe3cdc1b..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -5,11 +5,11 @@ revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,7 +19,7 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 

From de598a0cc3fd4ee2d8585c5717c585bea01ef7b8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 31/79] gnome-todo: update to 3.28.1.

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

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 8f0bec9ffcdb3825042b4151c28b68b22089cc62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 32/79] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From cc5514af17e4decc87955ac9b8656ba95a7c92cb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 33/79] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From b4aaf70cea9c134a7a34028b7c499b573b904592 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 34/79] planner: rebuild with evolution-data-server-3.40.0

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..f292438ad31f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,7 +1,7 @@
 # Template file for 'planner'
 pkgname=planner
 version=2.5.7
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"

From 1da52d7deac5dcd71f5dc266bee9c9554b872b38 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 35/79] gnome-panel: update to 3.40.0.

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

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From 61acf47b6a6eb6b8ef13537ed9c55b328d1c8fde Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 36/79] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From 086ae83d4c4339f2945e04c206e411967b390cd3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 37/79] gnome-user-docs: update to 40.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 a4ab3218bd75..8edb370dc144 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=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From 29eef55247eb99b142ec094cbfa2026ada569548 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 38/79] libgdata: update to 0.18.1.

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

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From 8340fcb7e1067079de5e486afeca85575d816f07 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 39/79] gvfs: update to 1.48.0.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From 3a902c8c0ae62bdae090cf38adc2f9a1823d875a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 40/79] nautilus: update to 40.0.

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 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::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 10f393424cbfea14dee84c44f4870b3e5e5b23c2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 41/79] yelp-xsl: update to 40.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 88899d2ed720..3feefeb7a097 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=3.38.3
+version=40.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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From a444e23c6361c887840cc010d7b857cac0c21670 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 42/79] yelp-tools: update to 40.0.

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -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=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From 2ab7f9bfd997ecbb69f0ef6eefdc810b7c6bf8ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 43/79] yelp: update to 40.0.

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ 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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From 954eb66b9c104bfb6f2b656001e24d31fcfee58a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 44/79] gnome-shell-extensions: update to 40.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 4ea740326654..ba043950982e 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=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From c639937d1a47929083fb8442cc35623b6e8635a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 45/79] common/xbps-src: update-check checks new gnome upstream
 sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From bbb696f7c7d8920775e0270e35b2159b75a91ef0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 46/79] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From 234db47f2da7a675f372be0daf5adc0bdd6d421c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 47/79] eog: update to 40.0.

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ 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=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From d7b619faf7425d61f9e8b4a4aeda3d4d4467ad10 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 48/79] evince: update to 40.1.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.2
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
  libgxps-devel libsecret-devel libspectre-devel nautilus-devel
- poppler-glib-devel gspell-devel gst-plugins-base1-devel"
+ poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
+checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From b6fcc1d46da2eeeedba5f37a9f13dfb4cb4e5577 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 49/79] tepl: update to 6.00.0.

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

diff --git a/common/shlibs b/common/shlibs
index ff26e1de294a..cbf00f455879 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3467,7 +3467,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-5.so.0 tepl-4.2.0_1
+libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 798d5cd00775..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=5.0.0
+version=6.00.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74
+checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
 
 build_options="gir"
 build_options_default="gir"

From a8ab65d5d262625dd7e22e4e10c6a0c4357b09c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 50/79] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index cbf00f455879..3913af77ff8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3586,7 +3586,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-3.38.so gedit-3.37.3_1
+libgedit-40.0.so gedit-40.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index f73d3735b645..1dd86211ba77 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
 shlib_provides="libgedit-3.38.so"
 python_version=3
 

From b776e21914b718b1ca56fe4b814a3f96a14d50a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 51/79] gnome-disk-utility: update to 40.0.

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

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index d90f7d7d9fc4..4c94a74f037a 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,17 +1,18 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
 hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
 makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
- libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel"
+ libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
+ libhandy1-devel"
 depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
+checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897
 lib32disabled=yes

From 478c09042bd0002b9356aadff71c3b0d517fdbc9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 52/79] baobab: update to 40.0.

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 882155356a45..f6264797e694 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel"
+makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-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=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7

From 7e0e5531d4576064b50ec6b1ed4c843ff6807001 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:22 +0200
Subject: [PATCH 53/79] cheese: update to 40.0.

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

diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index faa329ee0e4a..f174034ae1af 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"

From fac4876027888340c3ec83baf35ebdf3ccf610e5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 54/79] gnome-calculator: update to 40.0.

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.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"
+ libmpc-devel libsoup-devel libhandy1-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=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

From cbd737fc9c59e0688e5d0ca0f5a601c03f09aa8f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 55/79] gnome-characters: update to 40.0.

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

diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index ac264e51a6af..472b961b1eeb 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-characters'
 pkgname=gnome-characters
-version=3.34.0
-revision=3
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel"
+makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
 depends="gnome-desktop gjs"
 short_desc="Utility to find and insert unusual characters for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57
+checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c
 lib32disabled=yes

From 62e0882f03c7cef1d85c4d7f08e613c22fb33e2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 56/79] gnome-clocks: update to 40.0.

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ 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=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

From 2dc33216548d1f3070e4e57edc028ddbe4cd863c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 57/79] gnome-font-viewer: update to 40.0.

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

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f74fcbcb000e..92748bbb386e 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
 makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel"
+ gnome-desktop-devel harfbuzz-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
+checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42

From 8db91c85c12dee3bea0aee7e60f2b874bb4ece65 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 58/79] gnome-maps: update to 40.0.

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

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index fa518223ce79..04fa87106e7a 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3
+checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49

From 7d1b1de2d7de80cee2c1a84f18e4d7ed7bb91470 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 59/79] gnome-music: update to 40.0.

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

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index cba2e901581a..40244199bba1 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
+checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6
 lib32disabled=yes

From d9724307e5ef2dc9e2a1b6140f425286aab8ec17 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 60/79] gnome-screenshot: update to 40.0.

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

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 0a5511db2173..579db2f88827 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-screenshot'
 pkgname=gnome-screenshot
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2

From 2a8b697f3bc97c36a76392357600f943721cc946 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 61/79] gnome-system-monitor: update to 40.0.

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

diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 069637e231c0..ecde52ba4395 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="pkg-config intltool itstool glib-devel polkit"
-makedepends="gtkmm-devel librsvg-devel libgtop-devel"
+makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SystemMonitor"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4
+checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756

From ee2a2c7c0ed99b4c747e2c58cd5c99bf9db6f59e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 62/79] vte3: update to 0.63.91.

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

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 90278ecf1523..300f20e19e8e 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.62.1
+version=0.63.91
 revision=1
 wrksrc="vte-${version}"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d
+checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 6a72b383ee7907363383b8c4dd1891e4983843da Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 63/79] gnome-terminal: update to 3.40.0.

---
 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 303ad85bdb18..4430ac709829 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.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -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=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From 40dac5bfc034619859cdf2e64415f478b259c3de Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 64/79] gnome-tweaks: update to 40.0.

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

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index d07507984433..10e7a38cf566 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
+checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From d75d06403bbadac4b89bbd2f0c3d007350b14ae6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 65/79] gnome-weather: update to 40.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 c028e46ba65d..f70aa2c3410e 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=3.36.1
-revision=2
+version=40.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"
+makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-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=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787
+checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef
 lib32disabled=yes

From f67196f770830416c13d47a32cc690e46bbbdcf2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 66/79] gspell: update to 1.8.4.

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..ea7f4862b113 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"

From 04fc532ed73ad42415d6a4028985d179d0d26081 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 67/79] orca: update to 40.0.

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

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 21f6450b37d0..58c745b3d803 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,6 +1,6 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
+checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From 50137caf7a678e454127f7f6144665b8dc575491 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 68/79] simple-scan: update to 40.0.

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

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b9df63878f87..4702a74b46b8 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,14 +1,14 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel "
+makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel"
 depends="hicolor-icon-theme sane"
 short_desc="GTK Simple scanning utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d
+checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af

From 3a457bc89264b1af83bbfa6aee97b21c1311c160 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 69/79] gedit-plugins: update to 40.0.

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

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index e288f0d3812b..5bbd7832900b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
+checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641
 python_version=3

From c4ab15472dfef9fd996e000b6de8da2d83f8c498 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 70/79] gnome-builder: update to 3.40.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 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ 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-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From 3c7eb20546889df6ecdb2d681e75e25d9cffd368 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:29 +0200
Subject: [PATCH 71/79] webkit2gtk: update to 2.32.0.

---
 .../webkit2gtk/patches/be-typedarray.patch    | 213 ------------------
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    |  40 ----
 srcpkgs/webkit2gtk/template                   |   8 +-
 3 files changed, 4 insertions(+), 257 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-typedarray.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
deleted file mode 100644
index 347728bbb92e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
-
-https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to-facebook
-
-Updated by @q66.
-
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index f08f852..53e2813 100644
---- Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-@@ -28,6 +28,7 @@
- #include "JSArrayBufferView.h"
- #include "ThrowScope.h"
- #include "ToNativeFromValue.h"
-+#include <wtf/FlipBytes.h>
- 
- namespace JSC {
- 
-@@ -147,7 +148,18 @@ public:
-     
-     JSValue getIndexQuickly(unsigned i) const
-     {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return Adaptor::toJSValue(flipBytes(getIndexQuicklyAsNativeValue(i)));
-+        }
-+#else
-         return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
-+#endif
-     }
-     
-     void setIndexQuicklyToNativeValue(unsigned i, typename Adaptor::Type value)
-@@ -164,7 +176,20 @@ public:
-     void setIndexQuickly(unsigned i, JSValue value)
-     {
-         ASSERT(!value.isObject());
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+            break;
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            setIndexQuicklyToNativeValue(i, flipBytes(toNativeFromValue<Adaptor>(value)));
-+            break;
-+        }
-+#else
-         setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+#endif
-     }
-     
-     bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -183,13 +208,54 @@ public:
-         if (i >= m_length)
-             return false;
- 
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            setIndexQuicklyToNativeValue(i, value);
-+            break;
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            setIndexQuicklyToNativeValue(i, flipBytes(value));
-+            break;
-+        }
-+#else
-         setIndexQuicklyToNativeValue(i, value);
-+#endif
-         return true;
-     }
- 
--    static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue) { return toNativeFromValue<Adaptor>(globalObject, jsValue); }
-+    static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue)
-+    {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValue<Adaptor>(globalObject, jsValue));
-+        }
-+#else
-+        return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+#endif
-+    }
- 
--    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
-+    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue)
-+    {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValueWithoutCoercion<Adaptor>(jsValue));
-+        }
-+#else
-+        return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+#endif
-+    }
- 
-     void sort()
-     {
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 5bca5d7..8a7111c 100644
---- Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -209,9 +209,36 @@ EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
-     scope.assertNoException();
-     RELEASE_ASSERT(!thisObject->isNeutered());
- 
--    if (std::isnan(static_cast<double>(*targetOption))) {
-+    double targetOptionLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+    switch (ViewClass::TypedArrayStorageType) {
-+    case TypeFloat32:
-+    case TypeFloat64:
-+        targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+    default:
-+        // typed array views are commonly expected to be little endian views of the underlying data
-+        targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+    }
-+#else
-+    targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+#endif
-+
-+    if (std::isnan(targetOptionLittleEndianAsDouble)) {
-         for (; index < length; ++index) {
--            if (std::isnan(static_cast<double>(array[index])))
-+            double arrayElementLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+            switch (ViewClass::TypedArrayStorageType) {
-+            case TypeFloat32:
-+            case TypeFloat64:
-+                arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+            default:
-+                // typed array views are commonly expected to be little endian views of the underlying data
-+                arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+            }
-+#else
-+            arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+#endif
-+            if (std::isnan(arrayElementLittleEndianAsDouble))
-                 return JSValue::encode(jsBoolean(true));
-         }
-     } else {
-diff --git Source/WTF/wtf/FlipBytes.h Source/WTF/wtf/FlipBytes.h
-index 6cd7126..24708f7 100644
---- Source/WTF/wtf/FlipBytes.h
-+++ Source/WTF/wtf/FlipBytes.h
-@@ -24,6 +24,7 @@
-  */
- 
- #pragma once
-+#include "Optional.h"
- 
- namespace WTF {
- 
-@@ -98,6 +99,42 @@ inline T flipBytes(T value)
-     return T();
- }
- 
-+template<typename T>
-+inline T flipBytes(WTF::Optional<T> value)
-+{
-+    if (sizeof(*value) == 1)
-+        return *value;
-+    if (sizeof(*value) == 2) {
-+        union {
-+            T original;
-+            uint16_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 4) {
-+        union {
-+            T original;
-+            uint32_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 8) {
-+        union {
-+            T original;
-+            uint64_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    RELEASE_ASSERT_NOT_REACHED();
-+    return T();
-+}
-+
- template<typename T>
- inline T flipBytesIfLittleEndian(T value, bool littleEndian)
- {
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
deleted file mode 100644
index 80448614717a..000000000000
--- a/srcpkgs/webkit2gtk/patches/ppc-llint.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=221710
-
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 66571beb5c60..e273c6dd28a8 100644
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1579,13 +1579,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
-     loadp StructureChain::m_vector[t3], t3
-     assert(macro (ok) btpnz t3, ok end)
- 
--    loadp Structure::m_prototype[t2], t2
-+    loadp Structure::m_prototype + PayloadOffset[t2], t2
-     btpz t2, .opPutByIdTransitionChainDone
- .opPutByIdTransitionChainLoop:
-     loadp [t3], t1
-     bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
-     addp 4, t3
--    loadp Structure::m_prototype[t1], t2
-+    loadp Structure::m_prototype + PayloadOffset[t1], t2
-     btpnz t2, .opPutByIdTransitionChainLoop
- 
- .opPutByIdTransitionChainDone:
-@@ -2251,7 +2251,7 @@ end)
- 
- 
- op(llint_throw_from_slow_path_trampoline, macro()
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
- 
-@@ -2260,7 +2260,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
-     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
-     # the throw target is not necessarily interpreted code, we come to here.
-     # This essentially emulates the JIT's throwing protocol.
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     jmp VM::targetMachinePCForThrow[t1]
- end)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 60ab9db8861f..00839744d861 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.30.6
+version=2.32.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -32,17 +32,17 @@ hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
- dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
+ dbus-glib-devel libwebp-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
- qt5-devel $(vopt_if x11 libXt-devel)
+ qt5-devel $(vopt_if x11 libXt-devel) libmanette-devel
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e
+checksum=9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"

From eca73fa706f3a4b33ec456f44ca13c783068dc3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 72/79] libvirt-glib: update to 4.0.0.

---
 srcpkgs/libvirt-glib/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..b91c6119892e 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
  python-devel $(vopt_if vala vala)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
@@ -13,8 +13,8 @@ short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
 build_options="gir vala"

From 212e36571a78fa9b85958a2e4c4a3d5683c5def1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:46 +0200
Subject: [PATCH 73/79] libmanette: update to 0.2.5.

---
 srcpkgs/libmanette/patches/time64.patch | 13 -------------
 srcpkgs/libmanette/template             |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/libmanette/patches/time64.patch

diff --git a/srcpkgs/libmanette/patches/time64.patch b/srcpkgs/libmanette/patches/time64.patch
deleted file mode 100644
index 50eec643171e..000000000000
--- a/srcpkgs/libmanette/patches/time64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/manette-device.c	2019-03-11 10:04:16.000000000 +0100
-+++ src/manette-device.c	2020-12-11 16:39:51.368792737 +0100
-@@ -415,8 +415,8 @@
-   ManetteEvent manette_event;
- 
-   manette_event.any.device = self;
--  manette_event.any.time = evdev_event->time.tv_sec * 1000 +
--                           evdev_event->time.tv_usec / 1000;
-+  manette_event.any.time = evdev_event->input_event_sec * 1000 +
-+                           evdev_event->input_event_usec / 1000;
-   manette_event.any.hardware_type = evdev_event->type;
-   manette_event.any.hardware_code = evdev_event->code;
-   manette_event.any.hardware_value = evdev_event->value;
diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index 2e9ae80e6245..c05dff01bf1c 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.2
+version=0.2.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b1b9fbaf84f1e383141a5715a2494f507e62313721ad993c39a868fc5ccf7d2
+checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From 2f0046fdcac9a3333808849d617a1596cb779102 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 74/79] gnome-sound-recorder: update to 40.0.

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

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2378517ae3f4..24431907839c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
+checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
 lib32disabled=yes

From a7585f7c294821095e93975ab7f0e8356f3d4bf5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 75/79] gnome-dictionary: update to 40.0.

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

diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 111d3bb484aa..15de25089c21 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.26.1
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dictionary"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5
 replaces="gnome-utils>=3.0"
 
 post_install() {

From b1f679b312a6866d3233d37ff8a51400a0888b8f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 76/79] gnome-boxes: update to 40.0.

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..06c2804b6870 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-boxes'
 pkgname=gnome-boxes
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,7 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
  libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
  libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
  tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy-devel"
+ libhandy1-devel tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,4 +17,4 @@ license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Boxes"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b
+checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5

From fa4679c33a0de0b011b0c5a0434687951f177a73 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 77/79] epiphany: update to 40.0.

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 7b8c824af59e..db7e343e5c9b 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ libarchive-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275
+checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844

From 35a457af9a1be03f41259396dca72f95385e8c3f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 78/79] gnome-core: update to 40.0.

---
 srcpkgs/gnome-core/template | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 075bd15cdd37..b01b92979fae 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=3.38.0
-revision=3
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=3.38.0
- at-spi2-core>=2.38.0
+ adwaita-icon-theme>=40.rc
+ at-spi2-core>=2.40.0
  at-spi2-atk>=2.38.0
- cantarell-fonts>=0.201
- dconf>=0.36.0
- evolution-data-server>=3.38.0
+ cantarell-fonts>=0.301
+ dconf>=0.40.0
+ evolution-data-server>=3.40.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
- gdm>=3.38.0
- geocode-glib>=3.26.0
+ gcr>=40.0
+ gdm>=3.40.0
+ geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.66.0
- glib>=2.66.0
- glib-networking>=2.66.0
+ gjs>=1.68.0
+ glib>=2.68.0
+ glib-networking>=2.68.0
  gmime3>=3.2.7
- gnome-backgrounds>=3.38.0
- gnome-bluetooth>=3.34.1
+ gnome-backgrounds>=40.rc
+ gnome-bluetooth>=3.34.3
  gnome-color-manager>=3.36.0
- gnome-control-center>=3.38.0
- gnome-desktop>=3.38.0
- gnome-getting-started-docs>=3.36.2
- gnome-initial-setup>=3.38.0
- gnome-keyring>=3.36.0
+ gnome-control-center>=40.0
+ gnome-desktop>=40.0
+ gnome-initial-setup>=40.0
+ gnome-keyring>=40.0
  gnome-online-accounts>=3.38.0
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
- gnome-shell>=3.38.0
- gnome-shell-extensions>=3.38.0
+ gnome-shell>=40.0
+ gnome-shell-extensions>=40.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=3.38.0
+ gnome-user-docs>=40.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=3.38.0
- gvfs>=1.46.0
- mutter>=3.38.0
- nautilus>=3.38.0
+ gsettings-desktop-schemas>=40.0
+ gvfs>=1.48.0
+ mutter>=40.0
+ nautilus>=40.0
  sushi>=3.38.0
- tracker3>=3.0.0
- yelp>=3.38.0
+ tracker3>=3.0.2
+ yelp>=40.0
  xdg-desktop-portal-gtk>=1.8.0
  zenity>=3.32.0"

From c513a35bdaaffd9e14d1e51ea7d05cfc1e2a2e70 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 79/79] gnome: update to 40.0.

---
 srcpkgs/gnome/template | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..4b0f96a4b019 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,69 +10,69 @@ homepage="https://www.gnome.org"
 
 depends="
  gnome-core>=${version}
- baobab>=3.38.0
+ baobab>=40.0
  cheese>=3.38.0
- eog>=3.38.0
- evince>=3.38.0
+ eog>=40.0
+ evince>=40.1
  file-roller>=3.38.0
- gedit>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
- gnome-disk-utility>=3.38.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
- gnome-screenshot>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
- gnome-tweaks>=3.34.0
- gnome-weather>=3.36.1
+ gedit>=40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-contacts>=40.0
+ gnome-disk-utility>=40.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
+ gnome-screenshot>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
+ gnome-tweaks>=40.0
+ gnome-weather>=40.0
  gsound>=1.0.2
- gspell>=1.8.3
+ gspell>=1.8.4
  mousetweaks>=3.32.0
- network-manager-applet>=1.8.2
- orca>=3.38.0
+ network-manager-applet>=1.20.0
+ orca>=40.0
  phodav>=2.5
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
- yelp-tools>=3.38.0"
+ yelp-tools>=40.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=40.0
  dconf-editor>=3.38.0
  devhelp>=3.38.0
- epiphany>=3.38.0
- evolution>=3.38.0
+ epiphany>=40.0
+ evolution>=40.0
  ghex>=3.18.4
  gitg>=3.32.1
- gedit-plugins>=3.38.0
- gnome-boxes>=3.38.0
- gnome-builder>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-dictionary>=3.26.1
- gnome-disk-utility>=3.38.0
+ gedit-plugins>=40.0
+ gnome-boxes>=40.0
+ gnome-builder>=3.40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-dictionary>=40.0
+ gnome-disk-utility>=40.0
  gnome-documents>=3.34.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
  gnome-nettool>=3.8.1
  gnome-photos>=3.38.0
  gnome-recipes>=2.0.2
- gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
+ gnome-screenshot>=40.0
+ gnome-sound-recorder>=40.0
+ gnome-system-monitor>=50.0
+ gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

Re: Update to Gnome-40

[Gottox]

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

New comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#issuecomment-812909921

Comment:
@q66 waiting till you update webkitgtk and patches.

Re: [PR REVIEW] Update to Gnome-40

[Oreo639]

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

New review comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#discussion_r606697601

Comment:
I'm guessing you want the `.so.0` split apart from the `.so` files but you accidentally left them in above.

Re: [PR REVIEW] Update to Gnome-40

[Oreo639]

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

New review comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#discussion_r606697658

Comment:
libmutter-8 doesn't provide `libmutter-cogl-path-8.so`, unless I am missing something.

Re: [PR REVIEW] Update to Gnome-40

[Oreo639]

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

New review comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#discussion_r606697601

Comment:
I'm guessing you want the `.so.0` files split apart from the `.so` files but you accidentally left them in above.

Re: [PR PATCH] [Updated] Update to Gnome-40

[Gottox]

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

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

https://github.com/Gottox/void-packages gnome40
https://github.com/void-linux/void-packages/pull/29974

Update to Gnome-40


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

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

From 194af536f654585e3ff9d323474681ef19187c1a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:57:35 -0700
Subject: [PATCH 01/80] gnome-desktop: update to 40.0

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -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=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 329d4c6e25cef6e08057bf7049f9285fe8f42028 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 02/80] gsettings-desktop-schemas: update to 40.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 76c4b0e08108..9aa049052172 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=3.38.0
+version=40.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=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From de2024c75a27ce21b1fdbf44c0b0c57f6b87f808 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:00 -0700
Subject: [PATCH 03/80] gtk4: update to 4.2.0

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index b555160a6993..6c06833196bc 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,10 +29,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="colord cups broadway wayland x11 cloudproviders vulkan gir"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 983feafaba0fa2c16ce0132477de66762fe10af5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:54 -0700
Subject: [PATCH 04/80] gnome-shell: update to 40.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..f5e8fe3cdc1b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -9,7 +9,7 @@ hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 4490be84fb0ee0197fd72e8ef63b6926d547ee12 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:01:11 -0700
Subject: [PATCH 05/80] gnome-settings-daemon: update to 40.0

---
 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 ecc62cf27782..824529fa11db 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=3.38.1
+version=40.0
 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=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From ef351ef5a1821f6f50050c7a37a0770ae2445f03 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:02:03 -0700
Subject: [PATCH 06/80] gnome-session: update to 40.beta

---
 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 c9bc4930c39f..cbe15db8170b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.38.0
+version=40.beta
 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=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 924b1c2d53ea946b4034fbc23694ab9bf4ea4004 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:15 -0700
Subject: [PATCH 07/80] gdm: update to 40.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 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=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From 1c31c7dc6419191f68ec1071df456492d77fc246 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:42 -0700
Subject: [PATCH 08/80] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..eb686d848214 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 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=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From e9b164e9ba017aeedca59bb9f2ae5c392fd4f799 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:04:04 -0700
Subject: [PATCH 09/80] gnome-control-center: update to 40.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From 027d98573cec086ba3e4e13e380a383b6f9e1ca0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:06:05 -0700
Subject: [PATCH 10/80] mutter: update to 40.0

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

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..ddf208fb9a32 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2924,15 +2924,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-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.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 70df3b8cf4be..a1c65c261b0c 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,10 +18,10 @@ short_desc="Lightweight GTK+3 window manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+distfiles="${GNOME_SITE}/${pkgname}/${version%*.}/${pkgname}-${version}.tar.xz"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +37,9 @@ do_check() {
 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-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 8047641537cdc0455d41a8ccc4673c93b4f3b289 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 11/80] adwaita-icon-theme: update to 40.rc.

---
 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 8ddcde9b7873..2ce6e203025c 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=3.38.0
+version=40.rc
 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=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From 8f0e3a6389125933e846df9a85cc658ac274a32c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 12/80] at-spi2-core: update to 2.40.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 74e607012012..e1c601f5d816 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.38.0
+version=2.40.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=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From cfeb7d548fee7b7d241533ac1787f149c7f10fbc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 13/80] dconf: update to 0.40.0.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..b79822642fc3 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From eede6aded0585d8de0da9f84d823270e6f1feac8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 14/80] gcr: update to 3.40.0.

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

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From 7db78ff0d6e5fbbcda089bc5c966abd363e0f2df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 15/80] gobject-introspection: update to 1.68.0.

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

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..b853759a9583 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 

From fba1fec76784fcb34d1791d065defa04b095a3d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 16/80] gjs: update to 1.68.0.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..542e59df3add 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
 
 post_install() {
 	vlicense COPYING

From cd4b9075727d032df20c3c3096d38d7e9dfc5346 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 17/80] glib: update to 2.68.0.

---
 .../glib/patches/disable-broken-tests.patch   | 52 -------------------
 srcpkgs/glib/template                         |  4 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 15e87215d276..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
---- gio/tests/meson.build
-+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
-   endforeach
- endif
- 
--if not meson.is_cross_build() or meson.has_exe_wrapper()
-+if false
- 
-   plugin_resources_c = custom_target('plugin-resources.c',
-     input : 'test4.gresource.xml',
-diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
---- glib/tests/meson.build
-+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
-   'error' : {},
--  'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 8fc75d418802d8b7256dc5cfc812ef1bea785c5f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 18/80] glib-networking: update to 2.68.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 96f312cff4d8..fdb7fbfe8d1a 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.66.0
+version=2.68.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=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From 511e75370f5a040741a2c947d4dd8a44652f577e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 19/80] gnome-backgrounds: update to 40.rc.

---
 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 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 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=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From 9b018e0297a77af3fb41da398091b39cac5e76db Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 20/80] gnome-initial-setup: update to 40.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 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=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From f42b78847f0e63b6a809d3040a4c45ebc8dd72f9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 21/80] evolution-data-server: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index ddf208fb9a32..540ca2199a63 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -605,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 88426d4b77ed7044d9fc04d9b73a91348149f473 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 22/80] evolution: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index 540ca2199a63..d48870f2d77e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From f261265273ffefd2bd345f75a12af43f47555f19 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 23/80] evolution-ews: update to 3.40.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 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.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From 650cb028306f90ced041d100d0cb11fe8d3bd48f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 24/80] bijiben: update to 40.0.

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

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From 14646d2fd217f8250cbd9254a008cf01c0ab2372 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 25/80] python3-gobject: update to 3.40.1.

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..8dc5d7a84009 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From fedee3668ab298b10c599f6ec8ed1835ebe9a7a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 26/80] libgweather: update to 40.0.

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index eb686d848214..140f24a2c662 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -6,8 +6,8 @@ build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
+hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala) python3-gobject-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 97386750e9e4ad292e01a404fefc8e1b6cff0219 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 27/80] folks: update to 0.14.0.

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From 132bba9a8891974af4de8208c6ee58246a1dbdab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 28/80] gnome-calendar: update to 40.0.

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.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 libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-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>"
@@ -13,7 +13,7 @@ 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=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From f7f48c6a5d309adb6006c509fdda990538d56f49 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 29/80] gnome-contacts: update to 40.0.

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 9d45152c1966c14487a3e67c467df1523f490a26 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 30/80] gnome-shell: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f5e8fe3cdc1b..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -5,11 +5,11 @@ revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,7 +19,7 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 

From 8b9811ca103059a8db277e0cc2fcebb5b735be12 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 31/80] gnome-todo: update to 3.28.1.

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

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From c896a2e7cfe2c821cbdfd942f275220c62aff991 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 32/80] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From 1e7aeb370e9e4f2d5bc3e3da1582df468fcb0401 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 33/80] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From 147442c87a0dbe0c6ea7fcb9e0a3fc1053dec6b0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 34/80] planner: rebuild with evolution-data-server-3.40.0

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..f292438ad31f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,7 +1,7 @@
 # Template file for 'planner'
 pkgname=planner
 version=2.5.7
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"

From 77f3febaff0204ea1e56f9ac8d80b6c46506491d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 35/80] gnome-panel: update to 3.40.0.

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

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From a4acba450237814376836a07ed5abf560b6f14ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 36/80] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From 9a8fc9efc609562e2d6453589e9329954d1570e2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 37/80] gnome-user-docs: update to 40.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 a4ab3218bd75..8edb370dc144 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=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From 37980acae2199326e3696d764b1de52e404798b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 38/80] libgdata: update to 0.18.1.

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

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From 20dc120fc15200c27bd78709f4d78eb72d506fd6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 39/80] gvfs: update to 1.48.0.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From 26bf9c685a735f313d5e180bafb18ca7eee19421 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 40/80] nautilus: update to 40.0.

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 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::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From 6f60d810490c3beba08f360ba913ab938838c472 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 41/80] yelp-xsl: update to 40.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 88899d2ed720..3feefeb7a097 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=3.38.3
+version=40.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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From a099931321f3afd94a4f29bda8f2254c8af1fbe2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 42/80] yelp-tools: update to 40.0.

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -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=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From 53873bbd19e408679172a0a8be0b4cf6ecb74667 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 43/80] yelp: update to 40.0.

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ 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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From 0f25b14e03132b9bbd0c519a47503cf83e222bee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 44/80] gnome-shell-extensions: update to 40.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 4ea740326654..ba043950982e 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=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From 6d7469824e352d52b38796ceb331f0f6c8538528 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 45/80] common/xbps-src: update-check checks new gnome upstream
 sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From edf8e4e5fdb344b4db1f06f1ea7c715c223666a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 46/80] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From e0f27698cf1fc82e2940d3a5b27d5c2cb9326aa0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 47/80] eog: update to 40.0.

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ 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=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 23ee826c8c9e754880798a1fc6a3431d83e8da4c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 48/80] evince: update to 40.1.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.2
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
  libgxps-devel libsecret-devel libspectre-devel nautilus-devel
- poppler-glib-devel gspell-devel gst-plugins-base1-devel"
+ poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
+checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From c5fd8111e41e4a248499e1e937f35d927f36aebc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 49/80] tepl: update to 6.00.0.

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

diff --git a/common/shlibs b/common/shlibs
index d48870f2d77e..e5d84e2fac40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3460,7 +3460,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-5.so.0 tepl-4.2.0_1
+libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 798d5cd00775..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=5.0.0
+version=6.00.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74
+checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
 
 build_options="gir"
 build_options_default="gir"

From 8fa0410ca99630e6687641a04e8a72837f8299fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 50/80] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index e5d84e2fac40..cf9a9e89038f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3579,7 +3579,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-3.38.so gedit-3.37.3_1
+libgedit-40.0.so gedit-40.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index f73d3735b645..1dd86211ba77 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
 shlib_provides="libgedit-3.38.so"
 python_version=3
 

From 86f4639940a2dd8a7392f49fdb6348096cf27f10 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 51/80] gnome-disk-utility: update to 40.0.

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

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index d90f7d7d9fc4..4c94a74f037a 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,17 +1,18 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
 hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
 makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
- libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel"
+ libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
+ libhandy1-devel"
 depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
+checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897
 lib32disabled=yes

From 8bf471a83c5afe7078f506520ca776996c1a5d76 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 52/80] baobab: update to 40.0.

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 882155356a45..f6264797e694 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel"
+makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-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=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7

From 221f43b801ec4b8871beb2e02de4cb46c2ecb1d2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:22 +0200
Subject: [PATCH 53/80] cheese: update to 40.0.

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

diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index faa329ee0e4a..f174034ae1af 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"

From 3e88a1cec9b436f07f62a25a6ee599e9f7c31af6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 54/80] gnome-calculator: update to 40.0.

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.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"
+ libmpc-devel libsoup-devel libhandy1-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=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

From e44f7e989bea8d0b7aeb2c1bb5c22838f79fe772 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 55/80] gnome-characters: update to 40.0.

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

diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index ac264e51a6af..472b961b1eeb 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-characters'
 pkgname=gnome-characters
-version=3.34.0
-revision=3
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel"
+makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
 depends="gnome-desktop gjs"
 short_desc="Utility to find and insert unusual characters for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57
+checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c
 lib32disabled=yes

From f3b03221172908ea99e327b2f9a3e884c82043eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 56/80] gnome-clocks: update to 40.0.

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ 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=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

From ed601f8edde4769f362a5b8e5c32d9e3eaba4b37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 57/80] gnome-font-viewer: update to 40.0.

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

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f74fcbcb000e..92748bbb386e 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
 makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel"
+ gnome-desktop-devel harfbuzz-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
+checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42

From d612a9b90e9c8605d88c0f8b24d421c69ac23262 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 58/80] gnome-maps: update to 40.0.

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

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index fa518223ce79..04fa87106e7a 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3
+checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49

From 04b30af2d9c7bf9ec7e49c648bc26af2525873c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 59/80] gnome-music: update to 40.0.

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

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index cba2e901581a..40244199bba1 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
+checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6
 lib32disabled=yes

From 93d359d592e4889f107f4a8dda40f5682692e10d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 60/80] gnome-screenshot: update to 40.0.

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

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 0a5511db2173..579db2f88827 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-screenshot'
 pkgname=gnome-screenshot
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2

From 6352d4c6ba714d897c325835bb8fff031f4e4014 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 61/80] gnome-system-monitor: update to 40.0.

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

diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 069637e231c0..ecde52ba4395 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="pkg-config intltool itstool glib-devel polkit"
-makedepends="gtkmm-devel librsvg-devel libgtop-devel"
+makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SystemMonitor"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4
+checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756

From fd665be25b7cd7607ca81267deb7883e8f69a8b0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 62/80] vte3: update to 0.63.91.

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

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 90278ecf1523..300f20e19e8e 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.62.1
+version=0.63.91
 revision=1
 wrksrc="vte-${version}"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d
+checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From cc4937b2797ab5b8ca6ee23448f113c7c331f2a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 63/80] gnome-terminal: update to 3.40.0.

---
 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 303ad85bdb18..4430ac709829 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.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -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=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From 0b4a2dbeb2e66d451bff42b58bd68ae2480eb050 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 64/80] gnome-tweaks: update to 40.0.

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

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index d07507984433..10e7a38cf566 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
+checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From f67c6019dcc549dc73a4a640478c2408c900fe04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 65/80] gnome-weather: update to 40.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 c028e46ba65d..f70aa2c3410e 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=3.36.1
-revision=2
+version=40.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"
+makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-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=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787
+checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef
 lib32disabled=yes

From 8a3ffa91e8c8fe80d16e9f916ea69ca4fe691f46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 66/80] gspell: update to 1.8.4.

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..ea7f4862b113 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"

From 9ded8f31ab1d6a32f12be6a99e98aba898a341ba Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 67/80] orca: update to 40.0.

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

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 21f6450b37d0..58c745b3d803 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,6 +1,6 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
+checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From cd7310bbd4016f51d618ccf12a90f5fd9c74048d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 68/80] simple-scan: update to 40.0.

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

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b9df63878f87..4702a74b46b8 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,14 +1,14 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel "
+makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel"
 depends="hicolor-icon-theme sane"
 short_desc="GTK Simple scanning utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d
+checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af

From df95651aa5bbbc0dc6e19e0d8d71b1381d06422a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 69/80] gedit-plugins: update to 40.0.

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

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index e288f0d3812b..5bbd7832900b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
+checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641
 python_version=3

From 3948c7d8d44f817a72b5128eb94ab0ee108bfc2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 70/80] gnome-builder: update to 3.40.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 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ 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-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From ad200f01e6e662ae8f0176730690f21076ba2625 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:29 +0200
Subject: [PATCH 71/80] webkit2gtk: update to 2.32.0.

---
 .../webkit2gtk/patches/be-typedarray.patch    | 213 ------------------
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    |  40 ----
 srcpkgs/webkit2gtk/template                   |   8 +-
 3 files changed, 4 insertions(+), 257 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-typedarray.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
deleted file mode 100644
index 347728bbb92e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
-
-https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to-facebook
-
-Updated by @q66.
-
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index f08f852..53e2813 100644
---- Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-@@ -28,6 +28,7 @@
- #include "JSArrayBufferView.h"
- #include "ThrowScope.h"
- #include "ToNativeFromValue.h"
-+#include <wtf/FlipBytes.h>
- 
- namespace JSC {
- 
-@@ -147,7 +148,18 @@ public:
-     
-     JSValue getIndexQuickly(unsigned i) const
-     {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return Adaptor::toJSValue(flipBytes(getIndexQuicklyAsNativeValue(i)));
-+        }
-+#else
-         return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
-+#endif
-     }
-     
-     void setIndexQuicklyToNativeValue(unsigned i, typename Adaptor::Type value)
-@@ -164,7 +176,20 @@ public:
-     void setIndexQuickly(unsigned i, JSValue value)
-     {
-         ASSERT(!value.isObject());
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+            break;
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            setIndexQuicklyToNativeValue(i, flipBytes(toNativeFromValue<Adaptor>(value)));
-+            break;
-+        }
-+#else
-         setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+#endif
-     }
-     
-     bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -183,13 +208,54 @@ public:
-         if (i >= m_length)
-             return false;
- 
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            setIndexQuicklyToNativeValue(i, value);
-+            break;
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            setIndexQuicklyToNativeValue(i, flipBytes(value));
-+            break;
-+        }
-+#else
-         setIndexQuicklyToNativeValue(i, value);
-+#endif
-         return true;
-     }
- 
--    static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue) { return toNativeFromValue<Adaptor>(globalObject, jsValue); }
-+    static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue)
-+    {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValue<Adaptor>(globalObject, jsValue));
-+        }
-+#else
-+        return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+#endif
-+    }
- 
--    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
-+    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue)
-+    {
-+#if CPU(BIG_ENDIAN)
-+        switch (Adaptor::typeValue) {
-+        case TypeFloat32:
-+        case TypeFloat64:
-+            return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+        default:
-+            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValueWithoutCoercion<Adaptor>(jsValue));
-+        }
-+#else
-+        return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+#endif
-+    }
- 
-     void sort()
-     {
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 5bca5d7..8a7111c 100644
---- Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -209,9 +209,36 @@ EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
-     scope.assertNoException();
-     RELEASE_ASSERT(!thisObject->isNeutered());
- 
--    if (std::isnan(static_cast<double>(*targetOption))) {
-+    double targetOptionLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+    switch (ViewClass::TypedArrayStorageType) {
-+    case TypeFloat32:
-+    case TypeFloat64:
-+        targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+    default:
-+        // typed array views are commonly expected to be little endian views of the underlying data
-+        targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+    }
-+#else
-+    targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+#endif
-+
-+    if (std::isnan(targetOptionLittleEndianAsDouble)) {
-         for (; index < length; ++index) {
--            if (std::isnan(static_cast<double>(array[index])))
-+            double arrayElementLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+            switch (ViewClass::TypedArrayStorageType) {
-+            case TypeFloat32:
-+            case TypeFloat64:
-+                arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+            default:
-+                // typed array views are commonly expected to be little endian views of the underlying data
-+                arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+            }
-+#else
-+            arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+#endif
-+            if (std::isnan(arrayElementLittleEndianAsDouble))
-                 return JSValue::encode(jsBoolean(true));
-         }
-     } else {
-diff --git Source/WTF/wtf/FlipBytes.h Source/WTF/wtf/FlipBytes.h
-index 6cd7126..24708f7 100644
---- Source/WTF/wtf/FlipBytes.h
-+++ Source/WTF/wtf/FlipBytes.h
-@@ -24,6 +24,7 @@
-  */
- 
- #pragma once
-+#include "Optional.h"
- 
- namespace WTF {
- 
-@@ -98,6 +99,42 @@ inline T flipBytes(T value)
-     return T();
- }
- 
-+template<typename T>
-+inline T flipBytes(WTF::Optional<T> value)
-+{
-+    if (sizeof(*value) == 1)
-+        return *value;
-+    if (sizeof(*value) == 2) {
-+        union {
-+            T original;
-+            uint16_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 4) {
-+        union {
-+            T original;
-+            uint32_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 8) {
-+        union {
-+            T original;
-+            uint64_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    RELEASE_ASSERT_NOT_REACHED();
-+    return T();
-+}
-+
- template<typename T>
- inline T flipBytesIfLittleEndian(T value, bool littleEndian)
- {
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
deleted file mode 100644
index 80448614717a..000000000000
--- a/srcpkgs/webkit2gtk/patches/ppc-llint.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=221710
-
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 66571beb5c60..e273c6dd28a8 100644
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1579,13 +1579,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
-     loadp StructureChain::m_vector[t3], t3
-     assert(macro (ok) btpnz t3, ok end)
- 
--    loadp Structure::m_prototype[t2], t2
-+    loadp Structure::m_prototype + PayloadOffset[t2], t2
-     btpz t2, .opPutByIdTransitionChainDone
- .opPutByIdTransitionChainLoop:
-     loadp [t3], t1
-     bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
-     addp 4, t3
--    loadp Structure::m_prototype[t1], t2
-+    loadp Structure::m_prototype + PayloadOffset[t1], t2
-     btpnz t2, .opPutByIdTransitionChainLoop
- 
- .opPutByIdTransitionChainDone:
-@@ -2251,7 +2251,7 @@ end)
- 
- 
- op(llint_throw_from_slow_path_trampoline, macro()
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
- 
-@@ -2260,7 +2260,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
-     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
-     # the throw target is not necessarily interpreted code, we come to here.
-     # This essentially emulates the JIT's throwing protocol.
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     jmp VM::targetMachinePCForThrow[t1]
- end)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 60ab9db8861f..00839744d861 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.30.6
+version=2.32.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -32,17 +32,17 @@ hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
- dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
+ dbus-glib-devel libwebp-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
- qt5-devel $(vopt_if x11 libXt-devel)
+ qt5-devel $(vopt_if x11 libXt-devel) libmanette-devel
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e
+checksum=9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"

From 8f997ac3dbd5c95c3f3f70742e7d603dee338d22 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 72/80] libvirt-glib: update to 4.0.0.

---
 srcpkgs/libvirt-glib/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..b91c6119892e 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
  python-devel $(vopt_if vala vala)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
@@ -13,8 +13,8 @@ short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
 build_options="gir vala"

From bbaaeab49a878d752bb2acfedcbfa979245dcbee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:46 +0200
Subject: [PATCH 73/80] libmanette: update to 0.2.5.

---
 srcpkgs/libmanette/patches/time64.patch | 13 -------------
 srcpkgs/libmanette/template             |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/libmanette/patches/time64.patch

diff --git a/srcpkgs/libmanette/patches/time64.patch b/srcpkgs/libmanette/patches/time64.patch
deleted file mode 100644
index 50eec643171e..000000000000
--- a/srcpkgs/libmanette/patches/time64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/manette-device.c	2019-03-11 10:04:16.000000000 +0100
-+++ src/manette-device.c	2020-12-11 16:39:51.368792737 +0100
-@@ -415,8 +415,8 @@
-   ManetteEvent manette_event;
- 
-   manette_event.any.device = self;
--  manette_event.any.time = evdev_event->time.tv_sec * 1000 +
--                           evdev_event->time.tv_usec / 1000;
-+  manette_event.any.time = evdev_event->input_event_sec * 1000 +
-+                           evdev_event->input_event_usec / 1000;
-   manette_event.any.hardware_type = evdev_event->type;
-   manette_event.any.hardware_code = evdev_event->code;
-   manette_event.any.hardware_value = evdev_event->value;
diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index 2e9ae80e6245..c05dff01bf1c 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.2
+version=0.2.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b1b9fbaf84f1e383141a5715a2494f507e62313721ad993c39a868fc5ccf7d2
+checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From 88cb6db1cc415943bf15b9d53a83ae9dd3225a78 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 74/80] gnome-sound-recorder: update to 40.0.

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

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2378517ae3f4..24431907839c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
+checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
 lib32disabled=yes

From e390886694c198173edd4edef9eff5108e7d493f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 75/80] gnome-dictionary: update to 40.0.

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

diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 111d3bb484aa..15de25089c21 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.26.1
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dictionary"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5
 replaces="gnome-utils>=3.0"
 
 post_install() {

From 899cd71e077b027fa4ff61d03c52c5bf45c46f95 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 76/80] gnome-boxes: update to 40.0.

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..06c2804b6870 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-boxes'
 pkgname=gnome-boxes
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,7 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
  libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
  libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
  tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy-devel"
+ libhandy1-devel tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,4 +17,4 @@ license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Boxes"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b
+checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5

From 8661565689d6cf69d7ac0cb56d0ee9d327cb3c99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 77/80] epiphany: update to 40.0.

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 7b8c824af59e..db7e343e5c9b 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ libarchive-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275
+checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844

From 764af266452684a9d5d471ee2d1c7a6fe6af6ad3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 78/80] gnome-core: update to 40.0.

---
 srcpkgs/gnome-core/template | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 075bd15cdd37..b01b92979fae 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=3.38.0
-revision=3
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=3.38.0
- at-spi2-core>=2.38.0
+ adwaita-icon-theme>=40.rc
+ at-spi2-core>=2.40.0
  at-spi2-atk>=2.38.0
- cantarell-fonts>=0.201
- dconf>=0.36.0
- evolution-data-server>=3.38.0
+ cantarell-fonts>=0.301
+ dconf>=0.40.0
+ evolution-data-server>=3.40.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
- gdm>=3.38.0
- geocode-glib>=3.26.0
+ gcr>=40.0
+ gdm>=3.40.0
+ geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.66.0
- glib>=2.66.0
- glib-networking>=2.66.0
+ gjs>=1.68.0
+ glib>=2.68.0
+ glib-networking>=2.68.0
  gmime3>=3.2.7
- gnome-backgrounds>=3.38.0
- gnome-bluetooth>=3.34.1
+ gnome-backgrounds>=40.rc
+ gnome-bluetooth>=3.34.3
  gnome-color-manager>=3.36.0
- gnome-control-center>=3.38.0
- gnome-desktop>=3.38.0
- gnome-getting-started-docs>=3.36.2
- gnome-initial-setup>=3.38.0
- gnome-keyring>=3.36.0
+ gnome-control-center>=40.0
+ gnome-desktop>=40.0
+ gnome-initial-setup>=40.0
+ gnome-keyring>=40.0
  gnome-online-accounts>=3.38.0
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
- gnome-shell>=3.38.0
- gnome-shell-extensions>=3.38.0
+ gnome-shell>=40.0
+ gnome-shell-extensions>=40.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=3.38.0
+ gnome-user-docs>=40.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=3.38.0
- gvfs>=1.46.0
- mutter>=3.38.0
- nautilus>=3.38.0
+ gsettings-desktop-schemas>=40.0
+ gvfs>=1.48.0
+ mutter>=40.0
+ nautilus>=40.0
  sushi>=3.38.0
- tracker3>=3.0.0
- yelp>=3.38.0
+ tracker3>=3.0.2
+ yelp>=40.0
  xdg-desktop-portal-gtk>=1.8.0
  zenity>=3.32.0"

From 7c091b55957b9dd219ddd145129226c36aed2841 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 79/80] gnome: update to 40.0.

---
 srcpkgs/gnome/template | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..4b0f96a4b019 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,69 +10,69 @@ homepage="https://www.gnome.org"
 
 depends="
  gnome-core>=${version}
- baobab>=3.38.0
+ baobab>=40.0
  cheese>=3.38.0
- eog>=3.38.0
- evince>=3.38.0
+ eog>=40.0
+ evince>=40.1
  file-roller>=3.38.0
- gedit>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
- gnome-disk-utility>=3.38.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
- gnome-screenshot>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
- gnome-tweaks>=3.34.0
- gnome-weather>=3.36.1
+ gedit>=40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-contacts>=40.0
+ gnome-disk-utility>=40.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
+ gnome-screenshot>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
+ gnome-tweaks>=40.0
+ gnome-weather>=40.0
  gsound>=1.0.2
- gspell>=1.8.3
+ gspell>=1.8.4
  mousetweaks>=3.32.0
- network-manager-applet>=1.8.2
- orca>=3.38.0
+ network-manager-applet>=1.20.0
+ orca>=40.0
  phodav>=2.5
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
- yelp-tools>=3.38.0"
+ yelp-tools>=40.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=40.0
  dconf-editor>=3.38.0
  devhelp>=3.38.0
- epiphany>=3.38.0
- evolution>=3.38.0
+ epiphany>=40.0
+ evolution>=40.0
  ghex>=3.18.4
  gitg>=3.32.1
- gedit-plugins>=3.38.0
- gnome-boxes>=3.38.0
- gnome-builder>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-dictionary>=3.26.1
- gnome-disk-utility>=3.38.0
+ gedit-plugins>=40.0
+ gnome-boxes>=40.0
+ gnome-builder>=3.40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-dictionary>=40.0
+ gnome-disk-utility>=40.0
  gnome-documents>=3.34.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
  gnome-nettool>=3.8.1
  gnome-photos>=3.38.0
  gnome-recipes>=2.0.2
- gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
+ gnome-screenshot>=40.0
+ gnome-sound-recorder>=40.0
+ gnome-system-monitor>=50.0
+ gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

From 56feafa7f8a216b19c691dfed02841c33d3fd0af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 80/80] gnome-getting-started-docs: remove, no longer part of
 gnome

---
 srcpkgs/gnome-getting-started-docs/template | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 srcpkgs/gnome-getting-started-docs/template

diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
deleted file mode 100644
index 63ba35af86de..000000000000
--- a/srcpkgs/gnome-getting-started-docs/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gnome-getting-started-docs'
-pkgname=gnome-getting-started-docs
-version=3.38.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="intltool itstool pkg-config"
-short_desc="Getting Started documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC-BY-SA-3.0"
-homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10fbe23f2c3ce427539a4e307a461694d3870b23200464f705b7d81af993c859

Re: [PR REVIEW] Update to Gnome-40

[Gottox]

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

New review comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#discussion_r606701435

Comment:
fixed

Re: [PR REVIEW] Update to Gnome-40

[Gottox]

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

New review comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29974#discussion_r606701453

Comment:
fixed

Re: [PR PATCH] [Updated] Update to Gnome-40

[Gottox]

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

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

https://github.com/Gottox/void-packages gnome40
https://github.com/void-linux/void-packages/pull/29974

Update to Gnome-40


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

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

From fa7d86d9da3101d5b98c878e48c81c7ea88e5f37 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:57:35 -0700
Subject: [PATCH 01/77] gnome-desktop: update to 40.0

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -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=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 17b81709ed6d01b664b6c93fdd6a23a92dd56f79 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 02/77] gsettings-desktop-schemas: update to 40.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 76c4b0e08108..9aa049052172 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=3.38.0
+version=40.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=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From 6fb53e509aa878045f8b6765f09d9f34ccd41ac1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:00 -0700
Subject: [PATCH 03/77] gtk4: update to 4.2.0

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index b555160a6993..6c06833196bc 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,10 +29,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="colord cups broadway wayland x11 cloudproviders vulkan gir"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 72045cf9cb631661bb88c4f7fcadb38d136dcf6e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:54 -0700
Subject: [PATCH 04/77] gnome-shell: update to 40.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..f5e8fe3cdc1b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -9,7 +9,7 @@ hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 28eca82ff3a6821e7972af2fa82abcb961c185df Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:01:11 -0700
Subject: [PATCH 05/77] gnome-settings-daemon: update to 40.0

---
 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 ecc62cf27782..824529fa11db 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=3.38.1
+version=40.0
 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=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From afa02b7d5f9bd00262b14486df2da12b9dfefae1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:02:03 -0700
Subject: [PATCH 06/77] gnome-session: update to 40.beta

---
 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 c9bc4930c39f..cbe15db8170b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.38.0
+version=40.beta
 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=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 5faa382bed8a494e241ca09c9bb84db5c1bbc3ca Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:15 -0700
Subject: [PATCH 07/77] gdm: update to 40.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 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=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From 64cd0eafbfe0eb836472e25f93e788748d09f089 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:42 -0700
Subject: [PATCH 08/77] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..eb686d848214 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 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=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From 70b00faee0e0e14225fc785e3c7d2e86ec5c0b03 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:04:04 -0700
Subject: [PATCH 09/77] gnome-control-center: update to 40.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From 669f80ecd1adfe5fedad8192de46e83e9c6a1c28 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:06:05 -0700
Subject: [PATCH 10/77] mutter: update to 40.0

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

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..ddf208fb9a32 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2924,15 +2924,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-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.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 70df3b8cf4be..a1c65c261b0c 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,10 +18,10 @@ short_desc="Lightweight GTK+3 window manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+distfiles="${GNOME_SITE}/${pkgname}/${version%*.}/${pkgname}-${version}.tar.xz"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +37,9 @@ do_check() {
 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-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 69b8d884aee434659fbd744dac4f25bce0ffbed3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 11/77] adwaita-icon-theme: update to 40.rc.

---
 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 8ddcde9b7873..2ce6e203025c 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=3.38.0
+version=40.rc
 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=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From 433e8119beadc93e0a5408821e92ff8742ebbfec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 12/77] at-spi2-core: update to 2.40.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 74e607012012..e1c601f5d816 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.38.0
+version=2.40.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=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From 48193083cb1030021cd794f68132f7519a675568 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 13/77] dconf: update to 0.40.0.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..b79822642fc3 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From 47b817966b829bb5fefaa09970d426d827f09623 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 14/77] gcr: update to 3.40.0.

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

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From 20f5fa84ca8797819f3b8de91219d0a9838dba97 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 15/77] gobject-introspection: update to 1.68.0.

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

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..b853759a9583 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 

From dd52b76deed61e9ed3dfce9fb78f6fc15a84a15c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 16/77] gjs: update to 1.68.0.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..542e59df3add 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
 
 post_install() {
 	vlicense COPYING

From 2a26de95ead790373b61b5ea675a83b91a0b9caf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 17/77] glib: update to 2.68.0.

---
 .../glib/patches/disable-broken-tests.patch   | 52 -------------------
 srcpkgs/glib/template                         |  4 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 15e87215d276..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
---- gio/tests/meson.build
-+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
-   endforeach
- endif
- 
--if not meson.is_cross_build() or meson.has_exe_wrapper()
-+if false
- 
-   plugin_resources_c = custom_target('plugin-resources.c',
-     input : 'test4.gresource.xml',
-diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
---- glib/tests/meson.build
-+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
-   'error' : {},
--  'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 2071bd42f57c468d5e7c835b767d496d2f05e2dc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 18/77] glib-networking: update to 2.68.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 96f312cff4d8..fdb7fbfe8d1a 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.66.0
+version=2.68.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=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From 23cb675930b2de50796ec10bcb4c6fd53b859ed9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 19/77] gnome-backgrounds: update to 40.rc.

---
 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 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 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=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From ffeacc1d082a34a61470c2509b2de5410630b8b8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 20/77] gnome-initial-setup: update to 40.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 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=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From a8d14cbd831937354ad46d72235492e6ca4460e4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 21/77] evolution-data-server: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index ddf208fb9a32..540ca2199a63 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -605,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 2d4f34921d6f342400b431d544554bf0c2eb2225 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 22/77] evolution: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index 540ca2199a63..d48870f2d77e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From 96c965b2fb9786a89ac23639d498c3735905364b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 23/77] evolution-ews: update to 3.40.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 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.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From 65e49ee36f79e2e2781b7c058c487a2e0756afff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 24/77] bijiben: update to 40.0.

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

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From 7f58db1faf958deb7d9eb8a4c2e669035fb5e053 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 25/77] python3-gobject: update to 3.40.1.

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..8dc5d7a84009 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From a7d25e835ac357d04a13f1664a7f0ca7bcba2b33 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 26/77] libgweather: update to 40.0.

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index eb686d848214..140f24a2c662 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -6,8 +6,8 @@ build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
+hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala) python3-gobject-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7ddb7b8ce0e1c49dc07ddb17ef7df48135d5b110 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 27/77] folks: update to 0.14.0.

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From 8e07db637de0842d593ed2400fd11976d2538f7c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 28/77] gnome-calendar: update to 40.0.

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.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 libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-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>"
@@ -13,7 +13,7 @@ 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=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From c722dd8c69abb1dfee139fd644152d323abdb72c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 29/77] gnome-contacts: update to 40.0.

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 0b5dfe114aab8a18110a29e744627e91e94cf9c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 30/77] gnome-shell: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f5e8fe3cdc1b..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -5,11 +5,11 @@ revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,7 +19,7 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 

From 8935ca885ca23b81b669f60abe7fdc388bf7ca3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 31/77] gnome-todo: update to 3.28.1.

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

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 9cda53eab43224aef7d72d4fefc5eb50e87c91a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 32/77] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From 206cae69fe31f0e2a55996a6f68a73a23cbc98f6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 33/77] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From 708995c750f696d24239ab3e1942608086f5a413 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 34/77] planner: rebuild with evolution-data-server-3.40.0

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..f292438ad31f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,7 +1,7 @@
 # Template file for 'planner'
 pkgname=planner
 version=2.5.7
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"

From d9dff9a3434a8db2021c3600abc6b85a7510ddd9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 35/77] gnome-panel: update to 3.40.0.

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

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From 3a745ef80016dfb9590aa75519274958c8ebd920 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 36/77] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From d703953aaee6e95384652a5b7120b6024469d5f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 37/77] gnome-user-docs: update to 40.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 a4ab3218bd75..8edb370dc144 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=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From 24777ec2ea731cb937be5d34e54c83aa206cb54f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 38/77] libgdata: update to 0.18.1.

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

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From 07339dab1223200c0c44d903b47568c3a815ad68 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 39/77] gvfs: update to 1.48.0.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From 8bf6616dace8b5fa3fac72d200506cd86563a7ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 40/77] nautilus: update to 40.0.

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 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::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From c2dd3a2391dd356271b416e71cd7212800048a00 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 41/77] yelp-xsl: update to 40.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 88899d2ed720..3feefeb7a097 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=3.38.3
+version=40.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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From 8369c522638390f9d791fbb7c05d0b53462516a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 42/77] yelp-tools: update to 40.0.

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -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=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From 8fc12b312a07feac378d07c1ca419cff372ee716 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 43/77] yelp: update to 40.0.

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ 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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From eacf4a558fee50b8354d4133ba49873cef7e1160 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 44/77] gnome-shell-extensions: update to 40.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 4ea740326654..ba043950982e 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=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From 9aec4140119e0380b2ee882f164157814c2f14d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 45/77] common/xbps-src: update-check checks new gnome upstream
 sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From 6de7e252c6e06dbb794bb1f3a12a5ec77bad8003 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 46/77] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From c6573eda5c50a21c4362abed5df5fa67eb4b9ca0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 47/77] eog: update to 40.0.

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ 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=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 3d4e18295d56e0f9a93e4940ed18650f2b367c42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 48/77] evince: update to 40.1.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.2
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
  libgxps-devel libsecret-devel libspectre-devel nautilus-devel
- poppler-glib-devel gspell-devel gst-plugins-base1-devel"
+ poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
+checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From 6ec3f1ae3886179a5a669d34f07fde16d8b040d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 49/77] tepl: update to 6.00.0.

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

diff --git a/common/shlibs b/common/shlibs
index d48870f2d77e..e5d84e2fac40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3460,7 +3460,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-5.so.0 tepl-4.2.0_1
+libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 798d5cd00775..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=5.0.0
+version=6.00.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74
+checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
 
 build_options="gir"
 build_options_default="gir"

From a58a64b415eca87205bfce0e07864f5950e55b63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 50/77] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index e5d84e2fac40..cf9a9e89038f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3579,7 +3579,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-3.38.so gedit-3.37.3_1
+libgedit-40.0.so gedit-40.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index f73d3735b645..1dd86211ba77 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
 shlib_provides="libgedit-3.38.so"
 python_version=3
 

From d7e61c8997d029ea65651e577231b106f53b2706 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 51/77] gnome-disk-utility: update to 40.0.

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

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index d90f7d7d9fc4..4c94a74f037a 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,17 +1,18 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
 hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
 makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
- libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel"
+ libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
+ libhandy1-devel"
 depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
+checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897
 lib32disabled=yes

From feee679bfe64b75baa28b80d9077cc966637820d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 52/77] baobab: update to 40.0.

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 882155356a45..f6264797e694 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel"
+makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-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=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7

From 027fc9dd8cb023c4b67f631a6b243a17d90e90dd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 53/77] gnome-calculator: update to 40.0.

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.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"
+ libmpc-devel libsoup-devel libhandy1-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=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

From 561a16f7e8d5a5791c99c94f0fdc575705bdb70f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 54/77] gnome-characters: update to 40.0.

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

diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index ac264e51a6af..472b961b1eeb 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-characters'
 pkgname=gnome-characters
-version=3.34.0
-revision=3
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel"
+makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
 depends="gnome-desktop gjs"
 short_desc="Utility to find and insert unusual characters for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57
+checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c
 lib32disabled=yes

From 8182c2fcf671f1bc55c92ad639991d7191ba9e25 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 55/77] gnome-clocks: update to 40.0.

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ 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=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

From 50c7701173d92a8b66661ddd65bd30e16f0d3da6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 56/77] gnome-font-viewer: update to 40.0.

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

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f74fcbcb000e..92748bbb386e 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
 makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel"
+ gnome-desktop-devel harfbuzz-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
+checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42

From e8f0ec9e9ed1de036554911252c03643cb82a1e3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 57/77] gnome-maps: update to 40.0.

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

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index fa518223ce79..04fa87106e7a 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3
+checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49

From 4d86cab4babb6d2917a2f0eeb9cc3deaaf743db3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 58/77] gnome-music: update to 40.0.

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

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index cba2e901581a..40244199bba1 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
+checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6
 lib32disabled=yes

From 46ec6868e7e9486cc199f56eb8b334d7faddc510 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 59/77] gnome-screenshot: update to 40.0.

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

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 0a5511db2173..579db2f88827 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-screenshot'
 pkgname=gnome-screenshot
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2

From b8d8d1b413b8bf596e499bdadb4ee3f2e65e4872 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 60/77] gnome-system-monitor: update to 40.0.

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

diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 069637e231c0..ecde52ba4395 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="pkg-config intltool itstool glib-devel polkit"
-makedepends="gtkmm-devel librsvg-devel libgtop-devel"
+makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SystemMonitor"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4
+checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756

From 13ac7432fd6b08dd3f835bfc8c4ff75943e845d9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 61/77] vte3: update to 0.63.91.

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

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 90278ecf1523..300f20e19e8e 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.62.1
+version=0.63.91
 revision=1
 wrksrc="vte-${version}"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d
+checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 11139ecdee1bd98b3255027376716daf0e4274cb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 62/77] gnome-terminal: update to 3.40.0.

---
 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 303ad85bdb18..4430ac709829 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.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -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=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From ecb4320f8bf3e624b9f476aabd94228c2357516b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 63/77] gnome-tweaks: update to 40.0.

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

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index d07507984433..10e7a38cf566 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
+checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From 78b41a950a8611db691f6d29780a07af2ae14ebe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 64/77] gnome-weather: update to 40.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 c028e46ba65d..f70aa2c3410e 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=3.36.1
-revision=2
+version=40.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"
+makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-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=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787
+checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef
 lib32disabled=yes

From 08ebeb57bd7fc83654d01a13745eb714287c4890 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 65/77] gspell: update to 1.8.4.

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..ea7f4862b113 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"

From 7333d63df8d686033b7e297c8b4685d5b8ccb093 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 66/77] orca: update to 40.0.

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

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 21f6450b37d0..58c745b3d803 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,6 +1,6 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
+checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From 7c0effc00bf2274178dd934bc0230ff60245c719 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 67/77] simple-scan: update to 40.0.

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

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b9df63878f87..4702a74b46b8 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,14 +1,14 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel "
+makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel"
 depends="hicolor-icon-theme sane"
 short_desc="GTK Simple scanning utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d
+checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af

From 88ca17699f0405edfa3cb646ebd9b52757844d89 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 68/77] gedit-plugins: update to 40.0.

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

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index e288f0d3812b..5bbd7832900b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
+checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641
 python_version=3

From a63ef67028e23174a4111ff630329a744141c798 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 69/77] gnome-builder: update to 3.40.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 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ 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-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From cc868703feb4b400b332ce3d36daa7cde858bb41 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 70/77] libvirt-glib: update to 4.0.0.

---
 srcpkgs/libvirt-glib/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..b91c6119892e 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
  python-devel $(vopt_if vala vala)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
@@ -13,8 +13,8 @@ short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
 build_options="gir vala"

From f8d0b7d1eb3ae1b4377c1e3845513f5621d7e626 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 71/77] gnome-sound-recorder: update to 40.0.

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

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2378517ae3f4..24431907839c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
+checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
 lib32disabled=yes

From 593b634d3370b151942086b81d960a5068c033f9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 72/77] gnome-dictionary: update to 40.0.

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

diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 111d3bb484aa..15de25089c21 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.26.1
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dictionary"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5
 replaces="gnome-utils>=3.0"
 
 post_install() {

From ab5835324a0303d468f7fc8d1e5a85abb205a7c4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 73/77] gnome-boxes: update to 40.0.

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..06c2804b6870 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-boxes'
 pkgname=gnome-boxes
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,7 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
  libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
  libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
  tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy-devel"
+ libhandy1-devel tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,4 +17,4 @@ license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Boxes"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b
+checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5

From d9ce86e38a0c96ce552778feca2351d0af061d84 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 74/77] epiphany: update to 40.0.

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 7b8c824af59e..db7e343e5c9b 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ libarchive-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275
+checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844

From 185cee5df7e7b30a37fa17de5abaf1b4fd2b1885 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 75/77] gnome-core: update to 40.0.

---
 srcpkgs/gnome-core/template | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 075bd15cdd37..b01b92979fae 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=3.38.0
-revision=3
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=3.38.0
- at-spi2-core>=2.38.0
+ adwaita-icon-theme>=40.rc
+ at-spi2-core>=2.40.0
  at-spi2-atk>=2.38.0
- cantarell-fonts>=0.201
- dconf>=0.36.0
- evolution-data-server>=3.38.0
+ cantarell-fonts>=0.301
+ dconf>=0.40.0
+ evolution-data-server>=3.40.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
- gdm>=3.38.0
- geocode-glib>=3.26.0
+ gcr>=40.0
+ gdm>=3.40.0
+ geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.66.0
- glib>=2.66.0
- glib-networking>=2.66.0
+ gjs>=1.68.0
+ glib>=2.68.0
+ glib-networking>=2.68.0
  gmime3>=3.2.7
- gnome-backgrounds>=3.38.0
- gnome-bluetooth>=3.34.1
+ gnome-backgrounds>=40.rc
+ gnome-bluetooth>=3.34.3
  gnome-color-manager>=3.36.0
- gnome-control-center>=3.38.0
- gnome-desktop>=3.38.0
- gnome-getting-started-docs>=3.36.2
- gnome-initial-setup>=3.38.0
- gnome-keyring>=3.36.0
+ gnome-control-center>=40.0
+ gnome-desktop>=40.0
+ gnome-initial-setup>=40.0
+ gnome-keyring>=40.0
  gnome-online-accounts>=3.38.0
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
- gnome-shell>=3.38.0
- gnome-shell-extensions>=3.38.0
+ gnome-shell>=40.0
+ gnome-shell-extensions>=40.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=3.38.0
+ gnome-user-docs>=40.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=3.38.0
- gvfs>=1.46.0
- mutter>=3.38.0
- nautilus>=3.38.0
+ gsettings-desktop-schemas>=40.0
+ gvfs>=1.48.0
+ mutter>=40.0
+ nautilus>=40.0
  sushi>=3.38.0
- tracker3>=3.0.0
- yelp>=3.38.0
+ tracker3>=3.0.2
+ yelp>=40.0
  xdg-desktop-portal-gtk>=1.8.0
  zenity>=3.32.0"

From 34c6af5fc4319be570e0cd6ea20d8662d1af3276 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 76/77] gnome: update to 40.0.

---
 srcpkgs/gnome/template | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..4b0f96a4b019 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,69 +10,69 @@ homepage="https://www.gnome.org"
 
 depends="
  gnome-core>=${version}
- baobab>=3.38.0
+ baobab>=40.0
  cheese>=3.38.0
- eog>=3.38.0
- evince>=3.38.0
+ eog>=40.0
+ evince>=40.1
  file-roller>=3.38.0
- gedit>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
- gnome-disk-utility>=3.38.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
- gnome-screenshot>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
- gnome-tweaks>=3.34.0
- gnome-weather>=3.36.1
+ gedit>=40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-contacts>=40.0
+ gnome-disk-utility>=40.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
+ gnome-screenshot>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
+ gnome-tweaks>=40.0
+ gnome-weather>=40.0
  gsound>=1.0.2
- gspell>=1.8.3
+ gspell>=1.8.4
  mousetweaks>=3.32.0
- network-manager-applet>=1.8.2
- orca>=3.38.0
+ network-manager-applet>=1.20.0
+ orca>=40.0
  phodav>=2.5
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
- yelp-tools>=3.38.0"
+ yelp-tools>=40.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=40.0
  dconf-editor>=3.38.0
  devhelp>=3.38.0
- epiphany>=3.38.0
- evolution>=3.38.0
+ epiphany>=40.0
+ evolution>=40.0
  ghex>=3.18.4
  gitg>=3.32.1
- gedit-plugins>=3.38.0
- gnome-boxes>=3.38.0
- gnome-builder>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-dictionary>=3.26.1
- gnome-disk-utility>=3.38.0
+ gedit-plugins>=40.0
+ gnome-boxes>=40.0
+ gnome-builder>=3.40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-dictionary>=40.0
+ gnome-disk-utility>=40.0
  gnome-documents>=3.34.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
  gnome-nettool>=3.8.1
  gnome-photos>=3.38.0
  gnome-recipes>=2.0.2
- gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
+ gnome-screenshot>=40.0
+ gnome-sound-recorder>=40.0
+ gnome-system-monitor>=50.0
+ gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

From 5967b52494e6716d6250f6e6fd339be0e96c72b7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 77/77] gnome-getting-started-docs: remove, no longer part of
 gnome

---
 srcpkgs/gnome-getting-started-docs/template | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 srcpkgs/gnome-getting-started-docs/template

diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
deleted file mode 100644
index 63ba35af86de..000000000000
--- a/srcpkgs/gnome-getting-started-docs/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gnome-getting-started-docs'
-pkgname=gnome-getting-started-docs
-version=3.38.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="intltool itstool pkg-config"
-short_desc="Getting Started documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC-BY-SA-3.0"
-homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10fbe23f2c3ce427539a4e307a461694d3870b23200464f705b7d81af993c859

Re: [PR PATCH] [Updated] Update to Gnome-40

[Gottox]

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

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

https://github.com/Gottox/void-packages gnome40
https://github.com/void-linux/void-packages/pull/29974

Update to Gnome-40


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

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

From fa7d86d9da3101d5b98c878e48c81c7ea88e5f37 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:57:35 -0700
Subject: [PATCH 01/97] gnome-desktop: update to 40.0

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -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=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 17b81709ed6d01b664b6c93fdd6a23a92dd56f79 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 02/97] gsettings-desktop-schemas: update to 40.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 76c4b0e08108..9aa049052172 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=3.38.0
+version=40.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=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From 6fb53e509aa878045f8b6765f09d9f34ccd41ac1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:00 -0700
Subject: [PATCH 03/97] gtk4: update to 4.2.0

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index b555160a6993..6c06833196bc 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,10 +29,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="colord cups broadway wayland x11 cloudproviders vulkan gir"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 72045cf9cb631661bb88c4f7fcadb38d136dcf6e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:54 -0700
Subject: [PATCH 04/97] gnome-shell: update to 40.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..f5e8fe3cdc1b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -9,7 +9,7 @@ hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 28eca82ff3a6821e7972af2fa82abcb961c185df Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:01:11 -0700
Subject: [PATCH 05/97] gnome-settings-daemon: update to 40.0

---
 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 ecc62cf27782..824529fa11db 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=3.38.1
+version=40.0
 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=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From afa02b7d5f9bd00262b14486df2da12b9dfefae1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:02:03 -0700
Subject: [PATCH 06/97] gnome-session: update to 40.beta

---
 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 c9bc4930c39f..cbe15db8170b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.38.0
+version=40.beta
 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=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 5faa382bed8a494e241ca09c9bb84db5c1bbc3ca Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:15 -0700
Subject: [PATCH 07/97] gdm: update to 40.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 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=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From 64cd0eafbfe0eb836472e25f93e788748d09f089 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:42 -0700
Subject: [PATCH 08/97] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..eb686d848214 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 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=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From 70b00faee0e0e14225fc785e3c7d2e86ec5c0b03 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:04:04 -0700
Subject: [PATCH 09/97] gnome-control-center: update to 40.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From 669f80ecd1adfe5fedad8192de46e83e9c6a1c28 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:06:05 -0700
Subject: [PATCH 10/97] mutter: update to 40.0

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

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..ddf208fb9a32 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2924,15 +2924,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-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.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 70df3b8cf4be..a1c65c261b0c 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,10 +18,10 @@ short_desc="Lightweight GTK+3 window manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+distfiles="${GNOME_SITE}/${pkgname}/${version%*.}/${pkgname}-${version}.tar.xz"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +37,9 @@ do_check() {
 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-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 69b8d884aee434659fbd744dac4f25bce0ffbed3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 11/97] adwaita-icon-theme: update to 40.rc.

---
 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 8ddcde9b7873..2ce6e203025c 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=3.38.0
+version=40.rc
 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=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From 433e8119beadc93e0a5408821e92ff8742ebbfec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 12/97] at-spi2-core: update to 2.40.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 74e607012012..e1c601f5d816 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.38.0
+version=2.40.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=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From 48193083cb1030021cd794f68132f7519a675568 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 13/97] dconf: update to 0.40.0.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..b79822642fc3 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From 47b817966b829bb5fefaa09970d426d827f09623 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 14/97] gcr: update to 3.40.0.

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

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From 20f5fa84ca8797819f3b8de91219d0a9838dba97 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 15/97] gobject-introspection: update to 1.68.0.

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

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..b853759a9583 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 

From dd52b76deed61e9ed3dfce9fb78f6fc15a84a15c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 16/97] gjs: update to 1.68.0.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..542e59df3add 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
 
 post_install() {
 	vlicense COPYING

From 2a26de95ead790373b61b5ea675a83b91a0b9caf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 17/97] glib: update to 2.68.0.

---
 .../glib/patches/disable-broken-tests.patch   | 52 -------------------
 srcpkgs/glib/template                         |  4 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 15e87215d276..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
---- gio/tests/meson.build
-+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
-   endforeach
- endif
- 
--if not meson.is_cross_build() or meson.has_exe_wrapper()
-+if false
- 
-   plugin_resources_c = custom_target('plugin-resources.c',
-     input : 'test4.gresource.xml',
-diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
---- glib/tests/meson.build
-+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
-   'error' : {},
--  'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 2071bd42f57c468d5e7c835b767d496d2f05e2dc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 18/97] glib-networking: update to 2.68.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 96f312cff4d8..fdb7fbfe8d1a 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.66.0
+version=2.68.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=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From 23cb675930b2de50796ec10bcb4c6fd53b859ed9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 19/97] gnome-backgrounds: update to 40.rc.

---
 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 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 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=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From ffeacc1d082a34a61470c2509b2de5410630b8b8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 20/97] gnome-initial-setup: update to 40.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 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=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From a8d14cbd831937354ad46d72235492e6ca4460e4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 21/97] evolution-data-server: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index ddf208fb9a32..540ca2199a63 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -605,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 2d4f34921d6f342400b431d544554bf0c2eb2225 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 22/97] evolution: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index 540ca2199a63..d48870f2d77e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From 96c965b2fb9786a89ac23639d498c3735905364b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 23/97] evolution-ews: update to 3.40.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 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.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From 65e49ee36f79e2e2781b7c058c487a2e0756afff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 24/97] bijiben: update to 40.0.

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

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From 7f58db1faf958deb7d9eb8a4c2e669035fb5e053 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 25/97] python3-gobject: update to 3.40.1.

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..8dc5d7a84009 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From a7d25e835ac357d04a13f1664a7f0ca7bcba2b33 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 26/97] libgweather: update to 40.0.

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index eb686d848214..140f24a2c662 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -6,8 +6,8 @@ build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
+hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala) python3-gobject-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7ddb7b8ce0e1c49dc07ddb17ef7df48135d5b110 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 27/97] folks: update to 0.14.0.

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From 8e07db637de0842d593ed2400fd11976d2538f7c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 28/97] gnome-calendar: update to 40.0.

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.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 libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-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>"
@@ -13,7 +13,7 @@ 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=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From c722dd8c69abb1dfee139fd644152d323abdb72c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 29/97] gnome-contacts: update to 40.0.

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 0b5dfe114aab8a18110a29e744627e91e94cf9c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 30/97] gnome-shell: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f5e8fe3cdc1b..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -5,11 +5,11 @@ revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,7 +19,7 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 

From 8935ca885ca23b81b669f60abe7fdc388bf7ca3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 31/97] gnome-todo: update to 3.28.1.

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

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 9cda53eab43224aef7d72d4fefc5eb50e87c91a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 32/97] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From 206cae69fe31f0e2a55996a6f68a73a23cbc98f6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 33/97] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From 708995c750f696d24239ab3e1942608086f5a413 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 34/97] planner: rebuild with evolution-data-server-3.40.0

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..f292438ad31f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,7 +1,7 @@
 # Template file for 'planner'
 pkgname=planner
 version=2.5.7
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"

From d9dff9a3434a8db2021c3600abc6b85a7510ddd9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 35/97] gnome-panel: update to 3.40.0.

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

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From 3a745ef80016dfb9590aa75519274958c8ebd920 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 36/97] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From d703953aaee6e95384652a5b7120b6024469d5f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 37/97] gnome-user-docs: update to 40.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 a4ab3218bd75..8edb370dc144 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=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From 24777ec2ea731cb937be5d34e54c83aa206cb54f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 38/97] libgdata: update to 0.18.1.

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

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From 07339dab1223200c0c44d903b47568c3a815ad68 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 39/97] gvfs: update to 1.48.0.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From 8bf6616dace8b5fa3fac72d200506cd86563a7ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 40/97] nautilus: update to 40.0.

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 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::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From c2dd3a2391dd356271b416e71cd7212800048a00 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 41/97] yelp-xsl: update to 40.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 88899d2ed720..3feefeb7a097 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=3.38.3
+version=40.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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From 8369c522638390f9d791fbb7c05d0b53462516a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 42/97] yelp-tools: update to 40.0.

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -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=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From 8fc12b312a07feac378d07c1ca419cff372ee716 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 43/97] yelp: update to 40.0.

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ 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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From eacf4a558fee50b8354d4133ba49873cef7e1160 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 44/97] gnome-shell-extensions: update to 40.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 4ea740326654..ba043950982e 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=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From 9aec4140119e0380b2ee882f164157814c2f14d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 45/97] common/xbps-src: update-check checks new gnome upstream
 sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From 6de7e252c6e06dbb794bb1f3a12a5ec77bad8003 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 46/97] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From c6573eda5c50a21c4362abed5df5fa67eb4b9ca0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 47/97] eog: update to 40.0.

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ 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=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 3d4e18295d56e0f9a93e4940ed18650f2b367c42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 48/97] evince: update to 40.1.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.2
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
  libgxps-devel libsecret-devel libspectre-devel nautilus-devel
- poppler-glib-devel gspell-devel gst-plugins-base1-devel"
+ poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
+checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From 6ec3f1ae3886179a5a669d34f07fde16d8b040d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 49/97] tepl: update to 6.00.0.

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

diff --git a/common/shlibs b/common/shlibs
index d48870f2d77e..e5d84e2fac40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3460,7 +3460,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-5.so.0 tepl-4.2.0_1
+libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 798d5cd00775..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=5.0.0
+version=6.00.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74
+checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
 
 build_options="gir"
 build_options_default="gir"

From a58a64b415eca87205bfce0e07864f5950e55b63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 50/97] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index e5d84e2fac40..cf9a9e89038f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3579,7 +3579,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-3.38.so gedit-3.37.3_1
+libgedit-40.0.so gedit-40.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index f73d3735b645..1dd86211ba77 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
 shlib_provides="libgedit-3.38.so"
 python_version=3
 

From d7e61c8997d029ea65651e577231b106f53b2706 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 51/97] gnome-disk-utility: update to 40.0.

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

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index d90f7d7d9fc4..4c94a74f037a 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,17 +1,18 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
 hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
 makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
- libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel"
+ libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
+ libhandy1-devel"
 depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
+checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897
 lib32disabled=yes

From feee679bfe64b75baa28b80d9077cc966637820d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 52/97] baobab: update to 40.0.

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

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 882155356a45..f6264797e694 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel"
+makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-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=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7

From 027fc9dd8cb023c4b67f631a6b243a17d90e90dd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 53/97] gnome-calculator: update to 40.0.

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.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"
+ libmpc-devel libsoup-devel libhandy1-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=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

From 561a16f7e8d5a5791c99c94f0fdc575705bdb70f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 54/97] gnome-characters: update to 40.0.

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

diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index ac264e51a6af..472b961b1eeb 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-characters'
 pkgname=gnome-characters
-version=3.34.0
-revision=3
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel"
+makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
 depends="gnome-desktop gjs"
 short_desc="Utility to find and insert unusual characters for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57
+checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c
 lib32disabled=yes

From 8182c2fcf671f1bc55c92ad639991d7191ba9e25 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 55/97] gnome-clocks: update to 40.0.

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ 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=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

From 50c7701173d92a8b66661ddd65bd30e16f0d3da6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 56/97] gnome-font-viewer: update to 40.0.

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

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f74fcbcb000e..92748bbb386e 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
 makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel"
+ gnome-desktop-devel harfbuzz-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
+checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42

From e8f0ec9e9ed1de036554911252c03643cb82a1e3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 57/97] gnome-maps: update to 40.0.

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

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index fa518223ce79..04fa87106e7a 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3
+checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49

From 4d86cab4babb6d2917a2f0eeb9cc3deaaf743db3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 58/97] gnome-music: update to 40.0.

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

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index cba2e901581a..40244199bba1 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
+checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6
 lib32disabled=yes

From 46ec6868e7e9486cc199f56eb8b334d7faddc510 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 59/97] gnome-screenshot: update to 40.0.

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

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 0a5511db2173..579db2f88827 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-screenshot'
 pkgname=gnome-screenshot
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2

From b8d8d1b413b8bf596e499bdadb4ee3f2e65e4872 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 60/97] gnome-system-monitor: update to 40.0.

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

diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 069637e231c0..ecde52ba4395 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="pkg-config intltool itstool glib-devel polkit"
-makedepends="gtkmm-devel librsvg-devel libgtop-devel"
+makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SystemMonitor"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4
+checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756

From 13ac7432fd6b08dd3f835bfc8c4ff75943e845d9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 61/97] vte3: update to 0.63.91.

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

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 90278ecf1523..300f20e19e8e 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.62.1
+version=0.63.91
 revision=1
 wrksrc="vte-${version}"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d
+checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 11139ecdee1bd98b3255027376716daf0e4274cb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 62/97] gnome-terminal: update to 3.40.0.

---
 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 303ad85bdb18..4430ac709829 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.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -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=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From ecb4320f8bf3e624b9f476aabd94228c2357516b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 63/97] gnome-tweaks: update to 40.0.

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

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index d07507984433..10e7a38cf566 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
+checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From 78b41a950a8611db691f6d29780a07af2ae14ebe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 64/97] gnome-weather: update to 40.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 c028e46ba65d..f70aa2c3410e 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=3.36.1
-revision=2
+version=40.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"
+makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-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=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787
+checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef
 lib32disabled=yes

From 08ebeb57bd7fc83654d01a13745eb714287c4890 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 65/97] gspell: update to 1.8.4.

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..ea7f4862b113 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"

From 7333d63df8d686033b7e297c8b4685d5b8ccb093 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 66/97] orca: update to 40.0.

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

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 21f6450b37d0..58c745b3d803 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,6 +1,6 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
+checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From 7c0effc00bf2274178dd934bc0230ff60245c719 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 67/97] simple-scan: update to 40.0.

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

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b9df63878f87..4702a74b46b8 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,14 +1,14 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel "
+makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel"
 depends="hicolor-icon-theme sane"
 short_desc="GTK Simple scanning utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d
+checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af

From 88ca17699f0405edfa3cb646ebd9b52757844d89 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 68/97] gedit-plugins: update to 40.0.

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

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index e288f0d3812b..5bbd7832900b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
+checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641
 python_version=3

From a63ef67028e23174a4111ff630329a744141c798 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 69/97] gnome-builder: update to 3.40.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 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ 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-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From cc868703feb4b400b332ce3d36daa7cde858bb41 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 70/97] libvirt-glib: update to 4.0.0.

---
 srcpkgs/libvirt-glib/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..b91c6119892e 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
  python-devel $(vopt_if vala vala)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
@@ -13,8 +13,8 @@ short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
 build_options="gir vala"

From f8d0b7d1eb3ae1b4377c1e3845513f5621d7e626 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 71/97] gnome-sound-recorder: update to 40.0.

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

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2378517ae3f4..24431907839c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
+checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
 lib32disabled=yes

From 593b634d3370b151942086b81d960a5068c033f9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 72/97] gnome-dictionary: update to 40.0.

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

diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 111d3bb484aa..15de25089c21 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.26.1
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dictionary"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5
 replaces="gnome-utils>=3.0"
 
 post_install() {

From ab5835324a0303d468f7fc8d1e5a85abb205a7c4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 73/97] gnome-boxes: update to 40.0.

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..06c2804b6870 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-boxes'
 pkgname=gnome-boxes
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,7 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
  libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
  libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
  tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy-devel"
+ libhandy1-devel tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,4 +17,4 @@ license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Boxes"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b
+checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5

From d9ce86e38a0c96ce552778feca2351d0af061d84 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 74/97] epiphany: update to 40.0.

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 7b8c824af59e..db7e343e5c9b 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ libarchive-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275
+checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844

From 185cee5df7e7b30a37fa17de5abaf1b4fd2b1885 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 75/97] gnome-core: update to 40.0.

---
 srcpkgs/gnome-core/template | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 075bd15cdd37..b01b92979fae 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=3.38.0
-revision=3
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=3.38.0
- at-spi2-core>=2.38.0
+ adwaita-icon-theme>=40.rc
+ at-spi2-core>=2.40.0
  at-spi2-atk>=2.38.0
- cantarell-fonts>=0.201
- dconf>=0.36.0
- evolution-data-server>=3.38.0
+ cantarell-fonts>=0.301
+ dconf>=0.40.0
+ evolution-data-server>=3.40.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
- gdm>=3.38.0
- geocode-glib>=3.26.0
+ gcr>=40.0
+ gdm>=3.40.0
+ geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.66.0
- glib>=2.66.0
- glib-networking>=2.66.0
+ gjs>=1.68.0
+ glib>=2.68.0
+ glib-networking>=2.68.0
  gmime3>=3.2.7
- gnome-backgrounds>=3.38.0
- gnome-bluetooth>=3.34.1
+ gnome-backgrounds>=40.rc
+ gnome-bluetooth>=3.34.3
  gnome-color-manager>=3.36.0
- gnome-control-center>=3.38.0
- gnome-desktop>=3.38.0
- gnome-getting-started-docs>=3.36.2
- gnome-initial-setup>=3.38.0
- gnome-keyring>=3.36.0
+ gnome-control-center>=40.0
+ gnome-desktop>=40.0
+ gnome-initial-setup>=40.0
+ gnome-keyring>=40.0
  gnome-online-accounts>=3.38.0
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
- gnome-shell>=3.38.0
- gnome-shell-extensions>=3.38.0
+ gnome-shell>=40.0
+ gnome-shell-extensions>=40.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=3.38.0
+ gnome-user-docs>=40.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=3.38.0
- gvfs>=1.46.0
- mutter>=3.38.0
- nautilus>=3.38.0
+ gsettings-desktop-schemas>=40.0
+ gvfs>=1.48.0
+ mutter>=40.0
+ nautilus>=40.0
  sushi>=3.38.0
- tracker3>=3.0.0
- yelp>=3.38.0
+ tracker3>=3.0.2
+ yelp>=40.0
  xdg-desktop-portal-gtk>=1.8.0
  zenity>=3.32.0"

From 34c6af5fc4319be570e0cd6ea20d8662d1af3276 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 76/97] gnome: update to 40.0.

---
 srcpkgs/gnome/template | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..4b0f96a4b019 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,69 +10,69 @@ homepage="https://www.gnome.org"
 
 depends="
  gnome-core>=${version}
- baobab>=3.38.0
+ baobab>=40.0
  cheese>=3.38.0
- eog>=3.38.0
- evince>=3.38.0
+ eog>=40.0
+ evince>=40.1
  file-roller>=3.38.0
- gedit>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
- gnome-disk-utility>=3.38.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
- gnome-screenshot>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
- gnome-tweaks>=3.34.0
- gnome-weather>=3.36.1
+ gedit>=40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-contacts>=40.0
+ gnome-disk-utility>=40.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
+ gnome-screenshot>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
+ gnome-tweaks>=40.0
+ gnome-weather>=40.0
  gsound>=1.0.2
- gspell>=1.8.3
+ gspell>=1.8.4
  mousetweaks>=3.32.0
- network-manager-applet>=1.8.2
- orca>=3.38.0
+ network-manager-applet>=1.20.0
+ orca>=40.0
  phodav>=2.5
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
- yelp-tools>=3.38.0"
+ yelp-tools>=40.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=40.0
  dconf-editor>=3.38.0
  devhelp>=3.38.0
- epiphany>=3.38.0
- evolution>=3.38.0
+ epiphany>=40.0
+ evolution>=40.0
  ghex>=3.18.4
  gitg>=3.32.1
- gedit-plugins>=3.38.0
- gnome-boxes>=3.38.0
- gnome-builder>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-dictionary>=3.26.1
- gnome-disk-utility>=3.38.0
+ gedit-plugins>=40.0
+ gnome-boxes>=40.0
+ gnome-builder>=3.40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-dictionary>=40.0
+ gnome-disk-utility>=40.0
  gnome-documents>=3.34.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
  gnome-nettool>=3.8.1
  gnome-photos>=3.38.0
  gnome-recipes>=2.0.2
- gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
+ gnome-screenshot>=40.0
+ gnome-sound-recorder>=40.0
+ gnome-system-monitor>=50.0
+ gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

From 5967b52494e6716d6250f6e6fd339be0e96c72b7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 77/97] gnome-getting-started-docs: remove, no longer part of
 gnome

---
 srcpkgs/gnome-getting-started-docs/template | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 srcpkgs/gnome-getting-started-docs/template

diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
deleted file mode 100644
index 63ba35af86de..000000000000
--- a/srcpkgs/gnome-getting-started-docs/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gnome-getting-started-docs'
-pkgname=gnome-getting-started-docs
-version=3.38.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="intltool itstool pkg-config"
-short_desc="Getting Started documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC-BY-SA-3.0"
-homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10fbe23f2c3ce427539a4e307a461694d3870b23200464f705b7d81af993c859

From 3ee36f8f01ff2872a72bcf75f7029e504e52a579 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 78/97] gnome-books: update to 40.0.

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index 1d4974fe1832..bcb27e87c8ed 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-books'
 pkgname=gnome-books
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt
  gettext appstream-glib desktop-file-utils"
 makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel tracker-devel
- gnome-desktop-devel evince-devel libgepub-devel"
+ gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Books"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca5716a09e526ee43aa69dafffe5057b30edc648f56f554070c54a1db19d7b94
+checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130

From 985ee8e3a89c4731d575b6c8ceb1d75f749e3492 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 79/97] gnome: add gnome-books to apps

---
 srcpkgs/gnome/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 4b0f96a4b019..d46453df5cf4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -49,6 +49,7 @@ _apps_depends="
  ghex>=3.18.4
  gitg>=3.32.1
  gedit-plugins>=40.0
+ gnome-books>=40.0
  gnome-boxes>=40.0
  gnome-builder>=3.40.0
  gnome-calculator>=40.0

From 30b329e4d7b123697959de9cae745e2238100d34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 80/97] gnome-core: update gnome-bluetooth

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

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index b01b92979fae..5ce5866a501a 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -26,7 +26,7 @@ depends="
  glib-networking>=2.68.0
  gmime3>=3.2.7
  gnome-backgrounds>=40.rc
- gnome-bluetooth>=3.34.3
+ gnome-bluetooth>=3.34.5
  gnome-color-manager>=3.36.0
  gnome-control-center>=40.0
  gnome-desktop>=40.0

From 0c0dbc655bd2a3ae4db879303ed2187636f78ae0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 81/97] gnome-bluetooth: update to 3.34.5.

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

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 9a9480ad0ab1..80689df392fd 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.3
+version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -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=0a068e3bddbbdab46991521e6624098579abe80da242398bdd579c4ca6926422
+checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
 
 build_options="gir"
 build_options_default="gir"

From 49dae43536f73b39e537b17de819e58fa7be35cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 82/97] Revert "gnome-initial-setup: update to 40.0."

This reverts commit ffeacc1d082a34a61470c2509b2de5410630b8b8.
---
 srcpkgs/gnome-initial-setup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b5f24d939993..35e323179b97 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=40.0
+version=3.38.4
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f
+checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200

From e16dd2a8a928b065fac21fc878cbb82a950cdb81 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 83/97] gnome-initial-setup: update to 40.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 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=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From 4005c9403dad50b91586b97dca04d8d484c4e0e7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 84/97] gnome-usage: update to 3.38.1.

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

diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index 5ece1950473b..d57dd57a1c82 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-usage'
 pkgname=gnome-usage
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala gettext"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Usage"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94d58202fd92094ee2a2647ea3f96d0b16b5f5d7f9bf5ae99f1c33117d1a1a57
+checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393

From d94003b5dbb1b2a3368ecd5d31d6ba9c30552e50 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 85/97] gnome: add gnote

---
 srcpkgs/gnome/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index d46453df5cf4..df5d83c01c76 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=50.0
  gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
+ gnote>=40.0
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0

From 49d9a3c137e215feb04ddd22fb81ba2da729c6ff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 86/97] gnote: update to 40.0.

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

diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index 0ed64fd9239b..e2e25c08375f 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
 # Template file for 'gnote'
 pkgname=gnote
-version=3.38.1
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gnote"
 distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=c427d5e177339106e53976ab4f65f8719a48f7f712ce94d2184d545da174b2a9
+checksum=e224caf8bb433dec9a2258ea2f8739afabde577210e7fb17596614569f7d0b3b
 lib32disabled=yes

From 32664ff286ffd608b41fb36e10db395224b84b79 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 87/97] gtk+3: update to 3.24.28.

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

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 03f4a90c4992..60c6459b24b5 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+3'
 # Revbump gtk-layer-shell when updating, otherwise it presents a warning message
 pkgname=gtk+3
-version=3.24.26
+version=3.24.28
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -28,7 +28,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9
+checksum=b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"

From 9be831e22557a4d63080490845041ed411a020e2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 88/97] gtkmm: update to 3.24.4.

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

diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index 8efe5d72596d..d3beee8a20aa 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkmm'
 pkgname=gtkmm
-version=3.24.3
+version=3.24.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config mm-common gdk-pixbuf"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
 changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435
+checksum=9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743
 
 do_check() {
 	xvfb-run ninja -C build test

From e5b3edaa065d728c0731bd75dd873ed96b182a67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 89/97] gtranslator: update to 40.0.

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

diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index f9f9d0e3bc13..9f5b702461df 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,15 +1,16 @@
 # Template file for 'gtranslator'
 pkgname=gtranslator
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel itstool"
 makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
  gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel"
+ libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
+ libhandy1-devel"
 short_desc="GNOME translation making program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gtranslator"
 distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=dbcda9b81a22d9233be18e99fd5c448f6ab05759d1e94c10580bb831ca2d7635
+checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834

From 99d0092b92b619a13739d750af9c188228df03db Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 90/97] jsonrpc-glib: update to 3.38.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..17b59b243b63 100644
--- a/srcpkgs/jsonrpc-glib/template
+++ b/srcpkgs/jsonrpc-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonrpc-glib'
 pkgname=jsonrpc-glib
-version=3.32.0
-revision=2
+version=3.38.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false)
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 changelog="https://raw.githubusercontent.com/GNOME/jsonrpc-glib/jsonrpc-glib-3-32/NEWS"
 distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz"
-checksum=bc60aa36c8bdc9c701ad490508445633a9f3973ae0bd5bdd0633d5f6ffeea6eb
+checksum=dc5f1914a91152b70fa8fc9a11ede13148ab4af644db27a36632388c927a8a82
 
 build_options="gir vala"
 build_options_default="gir vala"

From f8a5828f4c463966cfe3cd13051877038922b168 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 91/97] libdazzle: update to 3.40.0.

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

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 9b807be94745..334e0f6a5433 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=e18af28217943bcec106585298a91ec3da48aa3ad62fd0992f23f0c70cd1678f
+checksum=dba99a7e65fa6662c012b306e5d0f99ff3b466a46059ea7aa0104aaf65ce4ba5
 
 build_options="gir"
 build_options_default="gir"

From 01390da585337252381e5c771ada1108c208e4e6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 92/97] libmanette: update to 0.2.6.

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

diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index c05dff01bf1c..cdf3888ac140 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.5
+version=0.2.6
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
+checksum=63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From 71e7ae1a088110204f6a80e9d2f26bf76562a21c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 93/97] libgudev: update to 236.

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

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 7f95c3ee2db9..47d1b8fc365d 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -1,20 +1,21 @@
 # Template file for 'libgudev'
 pkgname=libgudev
-version=233
+version=236
 revision=1
-build_style=gnu-configure
+build_style=meson
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-umockdev"
-hostmakedepends="pkg-config glib-devel"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvala=$(vopt_if vala enabled disabled)"
+hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://wiki.gnome.org/Projects/libgudev"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03
+checksum=e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524
 
-build_options="gir"
+build_options="gir vala"
 build_options_default="gir"
 
 replaces="eudev-libgudev>=0"
@@ -27,6 +28,9 @@ libgudev-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi

From 8fce58fddd0af83637b53aa8e70a41c0ebbf02fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 94/97] metacity: update to 3.40.0.

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

diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template
index 643ee4396b95..51904e577fbb 100644
--- a/srcpkgs/metacity/template
+++ b/srcpkgs/metacity/template
@@ -1,6 +1,6 @@
 # Template file for 'metacity'
 pkgname=metacity
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools zenity"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/metacity"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81193121b0d85dc93fef5701c00d0caf5313d10d9b19008403a4286cb04e11ac
+checksum=224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5

From 716cfca6b583f574abb5dd8a06c38219dc5ecb59 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 95/97] retro-gtk: update to 1.0.2.

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

diff --git a/srcpkgs/retro-gtk/template b/srcpkgs/retro-gtk/template
index 04ad9cf051b0..6fbb483b6e51 100644
--- a/srcpkgs/retro-gtk/template
+++ b/srcpkgs/retro-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'retro-gtk'
 pkgname=retro-gtk
-version=1.0.0
+version=1.0.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/retro-gtk"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5c7437a768125a6f627d063ed890e9328d4108db52a6d5aa10e52d2f25bb88db
+checksum=7118b0b5f9c1f2f0bc742faf8689eb48b44833efada0f6dbce990ec9783bcbd2
 
 build_options="gir"
 build_options_default="gir"

From 803912c59be6a09202de3584b00101e6280325a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 96/97] libpeas: update to 1.30.0.

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

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index be9de4fd4c65..a63e33fc5111 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
-version=1.26.0
-revision=2
+version=1.30.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376
+checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel

From 48273fb951c0ca778ddef9c634a9b132420a9b97 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 97/97] libgexiv2: update to 0.12.2.

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

diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template
index d1e5e2f53046..41b9138d7f4e 100644
--- a/srcpkgs/libgexiv2/template
+++ b/srcpkgs/libgexiv2/template
@@ -1,6 +1,6 @@
 # Template file for 'libgexiv2'
 pkgname=libgexiv2
-version=0.12.1
+version=0.12.2
 revision=1
 wrksrc="${pkgname/lib/}-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/gexiv2"
 distfiles="${GNOME_SITE}/gexiv2/${version%.*}/${pkgname/lib/}-${version}.tar.xz"
-checksum=8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77
+checksum=2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c
 
 build_options="gir vala"
 build_options_default="gir vala"

Re: [PR PATCH] [Updated] Update to Gnome-40

[Gottox]

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

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

https://github.com/Gottox/void-packages gnome40
https://github.com/void-linux/void-packages/pull/29974

Update to Gnome-40


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

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

From fa7d86d9da3101d5b98c878e48c81c7ea88e5f37 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:57:35 -0700
Subject: [PATCH 01/97] gnome-desktop: update to 40.0

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -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=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 17b81709ed6d01b664b6c93fdd6a23a92dd56f79 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 02/97] gsettings-desktop-schemas: update to 40.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 76c4b0e08108..9aa049052172 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=3.38.0
+version=40.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=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From 6fb53e509aa878045f8b6765f09d9f34ccd41ac1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:00 -0700
Subject: [PATCH 03/97] gtk4: update to 4.2.0

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index b555160a6993..6c06833196bc 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,10 +29,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="colord cups broadway wayland x11 cloudproviders vulkan gir"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 72045cf9cb631661bb88c4f7fcadb38d136dcf6e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:54 -0700
Subject: [PATCH 04/97] gnome-shell: update to 40.0

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..f5e8fe3cdc1b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -9,7 +9,7 @@ hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 28eca82ff3a6821e7972af2fa82abcb961c185df Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:01:11 -0700
Subject: [PATCH 05/97] gnome-settings-daemon: update to 40.0

---
 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 ecc62cf27782..824529fa11db 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=3.38.1
+version=40.0
 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=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From afa02b7d5f9bd00262b14486df2da12b9dfefae1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:02:03 -0700
Subject: [PATCH 06/97] gnome-session: update to 40.beta

---
 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 c9bc4930c39f..cbe15db8170b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.38.0
+version=40.beta
 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=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 5faa382bed8a494e241ca09c9bb84db5c1bbc3ca Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:15 -0700
Subject: [PATCH 07/97] gdm: update to 40.0

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 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=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From 64cd0eafbfe0eb836472e25f93e788748d09f089 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:42 -0700
Subject: [PATCH 08/97] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..eb686d848214 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 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=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From 70b00faee0e0e14225fc785e3c7d2e86ec5c0b03 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:04:04 -0700
Subject: [PATCH 09/97] gnome-control-center: update to 40.0

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From 669f80ecd1adfe5fedad8192de46e83e9c6a1c28 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:06:05 -0700
Subject: [PATCH 10/97] mutter: update to 40.0

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

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..ddf208fb9a32 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2924,15 +2924,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-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.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 70df3b8cf4be..a1c65c261b0c 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -18,10 +18,10 @@ short_desc="Lightweight GTK+3 window manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+distfiles="${GNOME_SITE}/${pkgname}/${version%*.}/${pkgname}-${version}.tar.xz"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +37,9 @@ do_check() {
 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-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 69b8d884aee434659fbd744dac4f25bce0ffbed3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 11/97] adwaita-icon-theme: update to 40.rc.

---
 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 8ddcde9b7873..2ce6e203025c 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=3.38.0
+version=40.rc
 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=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From 433e8119beadc93e0a5408821e92ff8742ebbfec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 12/97] at-spi2-core: update to 2.40.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 74e607012012..e1c601f5d816 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.38.0
+version=2.40.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=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From 48193083cb1030021cd794f68132f7519a675568 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 13/97] dconf: update to 0.40.0.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..b79822642fc3 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From 47b817966b829bb5fefaa09970d426d827f09623 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 14/97] gcr: update to 3.40.0.

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

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From 20f5fa84ca8797819f3b8de91219d0a9838dba97 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 15/97] gobject-introspection: update to 1.68.0.

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

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..b853759a9583 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 

From dd52b76deed61e9ed3dfce9fb78f6fc15a84a15c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 16/97] gjs: update to 1.68.0.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..542e59df3add 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
 
 post_install() {
 	vlicense COPYING

From 2a26de95ead790373b61b5ea675a83b91a0b9caf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 17/97] glib: update to 2.68.0.

---
 .../glib/patches/disable-broken-tests.patch   | 52 -------------------
 srcpkgs/glib/template                         |  4 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 15e87215d276..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
---- gio/tests/meson.build
-+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
--  'converter-stream' : {},
-   'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
-   endforeach
- endif
- 
--if not meson.is_cross_build() or meson.has_exe_wrapper()
-+if false
- 
-   plugin_resources_c = custom_target('plugin-resources.c',
-     input : 'test4.gresource.xml',
-diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
---- glib/tests/meson.build
-+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'cond' : {},
--  'convert' : {},
-   'dataset' : {},
--  'date' : {},
-   'dir' : {},
-   'environment' : {},
-   'error' : {},
--  'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
-     'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 2071bd42f57c468d5e7c835b767d496d2f05e2dc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 18/97] glib-networking: update to 2.68.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 96f312cff4d8..fdb7fbfe8d1a 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.66.0
+version=2.68.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=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From 23cb675930b2de50796ec10bcb4c6fd53b859ed9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 19/97] gnome-backgrounds: update to 40.rc.

---
 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 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 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=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From ffeacc1d082a34a61470c2509b2de5410630b8b8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 20/97] gnome-initial-setup: update to 40.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 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=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From a8d14cbd831937354ad46d72235492e6ca4460e4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 21/97] evolution-data-server: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index ddf208fb9a32..540ca2199a63 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -605,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 2d4f34921d6f342400b431d544554bf0c2eb2225 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 22/97] evolution: update to 3.40.0.

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

diff --git a/common/shlibs b/common/shlibs
index 540ca2199a63..d48870f2d77e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From 96c965b2fb9786a89ac23639d498c3735905364b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 23/97] evolution-ews: update to 3.40.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 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.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From 65e49ee36f79e2e2781b7c058c487a2e0756afff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 24/97] bijiben: update to 40.0.

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

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From 7f58db1faf958deb7d9eb8a4c2e669035fb5e053 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 25/97] python3-gobject: update to 3.40.1.

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..8dc5d7a84009 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From a7d25e835ac357d04a13f1664a7f0ca7bcba2b33 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 26/97] libgweather: update to 40.0.

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index eb686d848214..140f24a2c662 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -6,8 +6,8 @@ build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel"
+hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala) python3-gobject-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 checkdepends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7ddb7b8ce0e1c49dc07ddb17ef7df48135d5b110 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 27/97] folks: update to 0.14.0.

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From 8e07db637de0842d593ed2400fd11976d2538f7c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 28/97] gnome-calendar: update to 40.0.

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.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 libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-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>"
@@ -13,7 +13,7 @@ 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=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From c722dd8c69abb1dfee139fd644152d323abdb72c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 29/97] gnome-contacts: update to 40.0.

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 0b5dfe114aab8a18110a29e744627e91e94cf9c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 30/97] gnome-shell: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f5e8fe3cdc1b..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -5,11 +5,11 @@ revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -19,7 +19,7 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 

From 8935ca885ca23b81b669f60abe7fdc388bf7ca3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 31/97] gnome-todo: update to 3.28.1.

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

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 9cda53eab43224aef7d72d4fefc5eb50e87c91a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 32/97] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From 206cae69fe31f0e2a55996a6f68a73a23cbc98f6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 33/97] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From 708995c750f696d24239ab3e1942608086f5a413 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 34/97] planner: rebuild with evolution-data-server-3.40.0

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..f292438ad31f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,7 +1,7 @@
 # Template file for 'planner'
 pkgname=planner
 version=2.5.7
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"

From d9dff9a3434a8db2021c3600abc6b85a7510ddd9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 35/97] gnome-panel: update to 3.40.0.

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

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From 3a745ef80016dfb9590aa75519274958c8ebd920 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 36/97] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From d703953aaee6e95384652a5b7120b6024469d5f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 37/97] gnome-user-docs: update to 40.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 a4ab3218bd75..8edb370dc144 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=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From 24777ec2ea731cb937be5d34e54c83aa206cb54f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 38/97] libgdata: update to 0.18.1.

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

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From 07339dab1223200c0c44d903b47568c3a815ad68 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 39/97] gvfs: update to 1.48.0.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From 8bf6616dace8b5fa3fac72d200506cd86563a7ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 40/97] nautilus: update to 40.0.

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 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::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From c2dd3a2391dd356271b416e71cd7212800048a00 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 41/97] yelp-xsl: update to 40.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 88899d2ed720..3feefeb7a097 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=3.38.3
+version=40.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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From 8369c522638390f9d791fbb7c05d0b53462516a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 42/97] yelp-tools: update to 40.0.

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -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=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From 8fc12b312a07feac378d07c1ca419cff372ee716 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 43/97] yelp: update to 40.0.

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ 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-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From eacf4a558fee50b8354d4133ba49873cef7e1160 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 44/97] gnome-shell-extensions: update to 40.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 4ea740326654..ba043950982e 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=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From 9aec4140119e0380b2ee882f164157814c2f14d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 45/97] common/xbps-src: update-check checks new gnome upstream
 sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From 6de7e252c6e06dbb794bb1f3a12a5ec77bad8003 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 46/97] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From c6573eda5c50a21c4362abed5df5fa67eb4b9ca0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 47/97] eog: update to 40.0.

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ 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=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 3d4e18295d56e0f9a93e4940ed18650f2b367c42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 48/97] evince: update to 40.1.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 #