Github messages for voidlinux
 help / color / mirror / Atom feed
* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
@ 2021-04-03 13:19 ` Gottox
  2021-04-03 16:25 ` Oreo639
                   ` (112 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 13:19 UTC (permalink / raw)
  To: ml

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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
  2021-04-03 13:19 ` Update to Gnome-40 Gottox
@ 2021-04-03 16:25 ` Oreo639
  2021-04-03 16:30 ` Oreo639
                   ` (111 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 16:25 UTC (permalink / raw)
  To: ml

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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
  2021-04-03 13:19 ` Update to Gnome-40 Gottox
  2021-04-03 16:25 ` Oreo639
@ 2021-04-03 16:30 ` Oreo639
  2021-04-03 16:30 ` Oreo639
                   ` (110 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 16:30 UTC (permalink / raw)
  To: ml

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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2021-04-03 16:30 ` Oreo639
@ 2021-04-03 16:30 ` Oreo639
  2021-04-03 16:33 ` Oreo639
                   ` (109 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 16:30 UTC (permalink / raw)
  To: ml

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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (3 preceding siblings ...)
  2021-04-03 16:30 ` Oreo639
@ 2021-04-03 16:33 ` Oreo639
  2021-04-03 16:35 ` Oreo639
                   ` (108 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 16:33 UTC (permalink / raw)
  To: ml

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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (4 preceding siblings ...)
  2021-04-03 16:33 ` Oreo639
@ 2021-04-03 16:35 ` Oreo639
  2021-04-03 16:35 ` Oreo639
                   ` (107 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 16:35 UTC (permalink / raw)
  To: ml

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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (5 preceding siblings ...)
  2021-04-03 16:35 ` Oreo639
@ 2021-04-03 16:35 ` Oreo639
  2021-04-03 16:37 ` Gottox
                   ` (106 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 16:35 UTC (permalink / raw)
  To: ml

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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (6 preceding siblings ...)
  2021-04-03 16:35 ` Oreo639
@ 2021-04-03 16:37 ` Gottox
  2021-04-03 17:59 ` [PR PATCH] [Updated] " Gottox
                   ` (105 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 16:37 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (7 preceding siblings ...)
  2021-04-03 16:37 ` Gottox
@ 2021-04-03 17:59 ` Gottox
  2021-04-03 18:07 ` Gottox
                   ` (104 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 17:59 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (8 preceding siblings ...)
  2021-04-03 17:59 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-03 18:07 ` Gottox
  2021-04-03 18:12 ` Gottox
                   ` (103 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 18:07 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (9 preceding siblings ...)
  2021-04-03 18:07 ` Gottox
@ 2021-04-03 18:12 ` Gottox
  2021-04-03 18:49 ` Gottox
                   ` (102 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 18:12 UTC (permalink / raw)
  To: ml

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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (10 preceding siblings ...)
  2021-04-03 18:12 ` Gottox
@ 2021-04-03 18:49 ` Gottox
  2021-04-03 18:53 ` [PR REVIEW] " Oreo639
                   ` (101 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 18:49 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (11 preceding siblings ...)
  2021-04-03 18:49 ` Gottox
@ 2021-04-03 18:53 ` Oreo639
  2021-04-03 18:53 ` Oreo639
                   ` (100 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 18:53 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (12 preceding siblings ...)
  2021-04-03 18:53 ` [PR REVIEW] " Oreo639
@ 2021-04-03 18:53 ` Oreo639
  2021-04-03 18:59 ` Oreo639
                   ` (99 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 18:53 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (13 preceding siblings ...)
  2021-04-03 18:53 ` Oreo639
@ 2021-04-03 18:59 ` Oreo639
  2021-04-03 19:27 ` [PR PATCH] [Updated] " Gottox
                   ` (98 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-03 18:59 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (14 preceding siblings ...)
  2021-04-03 18:59 ` Oreo639
@ 2021-04-03 19:27 ` Gottox
  2021-04-03 19:28 ` [PR REVIEW] " Gottox
                   ` (97 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 19:27 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (15 preceding siblings ...)
  2021-04-03 19:27 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-03 19:28 ` Gottox
  2021-04-03 19:28 ` Gottox
                   ` (96 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 19:28 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (16 preceding siblings ...)
  2021-04-03 19:28 ` [PR REVIEW] " Gottox
@ 2021-04-03 19:28 ` Gottox
  2021-04-03 20:28 ` [PR PATCH] [Updated] " Gottox
                   ` (95 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 19:28 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (17 preceding siblings ...)
  2021-04-03 19:28 ` Gottox
@ 2021-04-03 20:28 ` Gottox
  2021-04-03 21:52 ` Gottox
                   ` (94 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 20:28 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (18 preceding siblings ...)
  2021-04-03 20:28 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-03 21:52 ` Gottox
  2021-04-03 21:58 ` Gottox
                   ` (93 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 21:52 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (19 preceding siblings ...)
  2021-04-03 21:52 ` Gottox
@ 2021-04-03 21:58 ` Gottox
  2021-04-03 22:11 ` Gottox
                   ` (92 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 21:58 UTC (permalink / raw)
  To: ml

[-- 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 62ba84fc87c23a47e198d86374f55b2fc4835616 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 77/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 99125048f807e35e5e6a5c060de3c3ab5e5a15f2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 78/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 132b9474db7d6e3582c8b47af107eb636cbfeede Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 79/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 681ba8d862282358bc4af9ea8507a545a9c3522c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 80/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 84f80bc442b01e633be5b8cffeb50dc1ca0b897c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 81/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 65b99d52a4e346bd915fe4a9b8b3a4134aefa34e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 82/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 fa1aa6435e83e159cd0b209d40a90bb2b3444f99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 83/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 bf8cf00eee14a2064961d3a48c21d122f9d27b1b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 84/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 abc0e70cf087c0fe0f560848bde2e76f101600f7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 85/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 17dd52b2ded00430a3d98847b87a726d23e8a6eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 86/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 872642b1d90e022487575b857285312bbdd2c7ee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 87/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 3761e9907295fddfc49b09d8eea2119c63fcc1be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 88/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 b94dbe7f6840284443a0b74d6d07ba69308dc6a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 89/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 0f7886e62342381580e8b5b98993be970d107683 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 90/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 dffae477bca9c2019ba15c99b7cb82fa6589b365 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 91/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 f8cafe61cb1303b04e152b7dc3f1e52c01652733 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 92/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 c1cd78d2bbb80c502cbe703e3450059ddb9c8429 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 93/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 21aba139d9e1d787163c7f12be50b39ad484b9af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 94/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 769cb97cf4c2940ac41d3c24898638ae2b38fd0f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 95/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 45bbecaa0aab5e4dcb8e8c00c4a9b6db4f417dbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 96/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"

From 71f31b1c5ddd26ac32e33c365352f47b52a3ddcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 97/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

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (20 preceding siblings ...)
  2021-04-03 21:58 ` Gottox
@ 2021-04-03 22:11 ` Gottox
  2021-04-03 22:14 ` Gottox
                   ` (91 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 22:11 UTC (permalink / raw)
  To: ml

[-- 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: 129940 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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/98] 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 62ba84fc87c23a47e198d86374f55b2fc4835616 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 77/98] 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 99125048f807e35e5e6a5c060de3c3ab5e5a15f2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 78/98] 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 132b9474db7d6e3582c8b47af107eb636cbfeede Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 79/98] 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 681ba8d862282358bc4af9ea8507a545a9c3522c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 80/98] 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 84f80bc442b01e633be5b8cffeb50dc1ca0b897c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 81/98] 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 65b99d52a4e346bd915fe4a9b8b3a4134aefa34e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 82/98] 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 fa1aa6435e83e159cd0b209d40a90bb2b3444f99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 83/98] 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 bf8cf00eee14a2064961d3a48c21d122f9d27b1b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 84/98] 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 abc0e70cf087c0fe0f560848bde2e76f101600f7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 85/98] 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 17dd52b2ded00430a3d98847b87a726d23e8a6eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 86/98] 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 872642b1d90e022487575b857285312bbdd2c7ee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 87/98] 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 3761e9907295fddfc49b09d8eea2119c63fcc1be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 88/98] 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 b94dbe7f6840284443a0b74d6d07ba69308dc6a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 89/98] 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 0f7886e62342381580e8b5b98993be970d107683 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 90/98] 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 dffae477bca9c2019ba15c99b7cb82fa6589b365 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 91/98] 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 f8cafe61cb1303b04e152b7dc3f1e52c01652733 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 92/98] 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 c1cd78d2bbb80c502cbe703e3450059ddb9c8429 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 93/98] 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 21aba139d9e1d787163c7f12be50b39ad484b9af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 94/98] 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 769cb97cf4c2940ac41d3c24898638ae2b38fd0f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 95/98] 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 45bbecaa0aab5e4dcb8e8c00c4a9b6db4f417dbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 96/98] 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"

From 71f31b1c5ddd26ac32e33c365352f47b52a3ddcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 97/98] 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 3888290a9d95c2c1c6ba12537826cc11296a1c9c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 98/98] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (21 preceding siblings ...)
  2021-04-03 22:11 ` Gottox
@ 2021-04-03 22:14 ` Gottox
  2021-04-04  7:21 ` Gottox
                   ` (90 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-03 22:14 UTC (permalink / raw)
  To: ml

[-- 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: 130918 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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/99] 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 62ba84fc87c23a47e198d86374f55b2fc4835616 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 77/99] 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 99125048f807e35e5e6a5c060de3c3ab5e5a15f2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 78/99] 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 132b9474db7d6e3582c8b47af107eb636cbfeede Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 79/99] 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 681ba8d862282358bc4af9ea8507a545a9c3522c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 80/99] 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 84f80bc442b01e633be5b8cffeb50dc1ca0b897c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 81/99] 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 65b99d52a4e346bd915fe4a9b8b3a4134aefa34e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 82/99] 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 fa1aa6435e83e159cd0b209d40a90bb2b3444f99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 83/99] 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 bf8cf00eee14a2064961d3a48c21d122f9d27b1b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 84/99] 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 abc0e70cf087c0fe0f560848bde2e76f101600f7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 85/99] 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 17dd52b2ded00430a3d98847b87a726d23e8a6eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 86/99] 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 872642b1d90e022487575b857285312bbdd2c7ee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 87/99] 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 3761e9907295fddfc49b09d8eea2119c63fcc1be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 88/99] 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 b94dbe7f6840284443a0b74d6d07ba69308dc6a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 89/99] 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 0f7886e62342381580e8b5b98993be970d107683 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 90/99] 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 dffae477bca9c2019ba15c99b7cb82fa6589b365 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 91/99] 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 f8cafe61cb1303b04e152b7dc3f1e52c01652733 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 92/99] 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 c1cd78d2bbb80c502cbe703e3450059ddb9c8429 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 93/99] 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 21aba139d9e1d787163c7f12be50b39ad484b9af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 94/99] 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 769cb97cf4c2940ac41d3c24898638ae2b38fd0f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 95/99] 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 45bbecaa0aab5e4dcb8e8c00c4a9b6db4f417dbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 96/99] 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"

From 71f31b1c5ddd26ac32e33c365352f47b52a3ddcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 97/99] 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 3888290a9d95c2c1c6ba12537826cc11296a1c9c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 98/99] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 00eb7176850270c4af24a2b3a8cf094e2f8d5b2c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 99/99] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (22 preceding siblings ...)
  2021-04-03 22:14 ` Gottox
@ 2021-04-04  7:21 ` Gottox
  2021-04-04  7:58 ` Gottox
                   ` (89 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04  7:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 671 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
* [ ] x86_64

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test

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: 130918 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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/99] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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/99] 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 c50848f48c7f84328ab8028585c4a4e107913388 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/99] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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/99] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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/99] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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/99] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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/99] 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 0900339f94877004a475abf1e806003d852c932e 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/99] 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 7eba990e6418b575f09268f1a0b6149128d91473 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/99] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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/99] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 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/99] 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 5145f8067a7f13c978c43dded8320e17d1f798ed 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/99] 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 ba617b9be23f25baf18894df361cea60e1934c52 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/99] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb 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/99] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd 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/99] 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 e8ec0bb87e372c007254a7159cab109fd328622a 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/99] 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 23d843805c6c9d71a010612324eaa2172971f632 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/99] 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 c22e7167e3f993176e88f95e24c432d281c37c73 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/99] 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 1e1a3dfa29cd27d22a55b8971a2cc01e6700efb7 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/99] 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 de6879dfc8b2a7a4fafb9fdeafc1cc132014affa 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/99] 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 1a457e52e40fe9149fca06330d8728f694ea7edf 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/99] 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 58c50865251c..2a22662a27db 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 bade8a92816135869e1458d9beb1d5bfb2737af3 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/99] 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 2a22662a27db..2d19086f4dbf 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 2606460d49e17401586f7e12026c39a15d57a8f2 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/99] 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 6d71cd8a831a13165a3e8bd859bacb0818140756 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/99] 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 9de6f6d59f9e7c09722c57bc95c5a8a0e2ed01c5 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/99] 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 00491dc9cb55b626f0f1ec883b6c77fe553d2303 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/99] 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 c8a3c6cd865a0cd1a17494f6c38663c2580e8f4f 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/99] 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 f9efab5c663b637d2d3932254b4011b0c9f20929 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/99] 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 957fc26b121499bb70569af23c882e5a31229479 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/99] 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 b06ffa073768a5395bb5f824572d0a10d5d71f03 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/99] 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 aeb8f88a596586b59dca1bfbe6d78ee1f9e2e427 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/99] 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 91e91b3f60ea2d83fa24798dec730add2510b927 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/99] 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 c00f8e60b334b5813bd8669eb869be3481d8dcaa 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/99] 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 0cdd04f861ac066835b7ff0ad3530030f7d662f6 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/99] 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 603208407eb77920386de6a75c061383ad4c2ec4 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/99] 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 201fb3bcf454ef8805844acae6dc0117dbd0245e 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/99] 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 16a2179141a29690f8fe7179698cc79ff2ad0b59 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/99] 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 3609fe75870ef1c85b667f00ad510e7c3b8672cd 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/99] 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 339753b4209b446498c23c0b1abaa966740d21bc 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/99] 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 9fd31a844dcb602a71e1589614adf543cb986d16 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/99] 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 7f2176cbbf18abf0f67617c9c60d712ecdec0a52 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/99] 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 106d1d3a66684a6b6f527b020fe3fe662e6056cb 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/99] 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 0791c1b4b4b385cb750663f5c32885e646b33cc2 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/99] 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 27b11ed51fd685377e816a606114103b8b7a7941 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/99] 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 a10726a4bb5b324ad26fd400a738e660d5dac07e 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/99] 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 13dc3ecfbb7a9c2b9386b66b2ac160dcfaf942db 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/99] 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 7cd3ab5de7027d70778b5b433bc3cd35914e090c 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/99] 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 60865c114c4470ae0e4961c67c689efa5dd5c722 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/99] 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 5dda05c48ff8ad6de7afc95ba393e65131a577ca 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/99] 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 2d19086f4dbf..3a99fc15eec6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 2ce40321b585b188007c6260a04b8e89f544200c 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/99] 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 3a99fc15eec6..83582f7961a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 f65e6ab49fe957527913251a9fb3eadfca177fe3 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/99] 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 7c362299198f51fffaeebac2bbb4e8f15c0cc141 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/99] 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 7bc0e1554dcf8229496343a5698df394d4ff60ba 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/99] 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 9f48b755aedd02845553b1220bb1f887945a063b 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/99] 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 df9c0d62fe0aecbd76e85c578defceda5a9a7ebf 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/99] 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 3edd1b4185439e5c03260a09c9cfd7ebb8b9d1f3 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/99] 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 099cc65b4ee090eceaef9d65a8ae5f8b31cf97df 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/99] 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 5b5ed727f54f63e923563124fb6375c69594f456 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/99] 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 69c1ccbdaf1de69d3ec7d79a52f4943c9bc7dc9f 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/99] 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 d089e33819fd1688ec7319bbb8e51a4af1979b6e 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/99] 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 5c87cd959d61fa32fc19ed841afb51eb85532382 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/99] 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 5bd6c163dc05e34805289d3e50acfd56aec79c14 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/99] 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 58087fb0f4b65dec7085f4df1360546534197149 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/99] 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 f243dcd72fca6e8f7e493f92681433e5398a6b4a 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/99] 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 c034a6f5668ac732313255a89c0dc899db2bd75a 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/99] 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 f746c2385ce6013568482eb3f85f78b2c3f7d8b9 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/99] 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 ce95e31d106568e391558d567e81c3395edd290e 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/99] 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 85a5c52ff3055daae6fd82946ac23e9b80a2d13b 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/99] 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 21a08402d0fa52c01df643a37d79be863c4c2f3d 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/99] 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 ff497b92a5669a892789055fd7bbfa664d2010c5 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/99] 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 d9713079213db12db6a12e4cd89a9bdc222797ab 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/99] 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 aacf26bc12675ccd037b242ed2000de9e9a9d3db 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/99] 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 4a501d6401a365dade3890c813730caea6dae049 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/99] 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 b62735c29ee20310a21d534883c27ff627ada115 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/99] 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 d436a3dd1a0b841872facbfa36aecbfbd062fffc 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/99] 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 cf4328c92dfe816549ff5b725523f62c28e71383 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/99] 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 59b3e94d13ea316e0bfcd574299d8957278c40b4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 77/99] 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 33a9dcb483e4f220dd0d26eaff07e7b51db73b0b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 78/99] 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 a6feb74b8fc56766414e753bd17964b170a9cf67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 79/99] 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 f8151bfea2ec945e47abf58ed7184f487cb56b8d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 80/99] 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 4a185127811242941d902a42a41349cb2a9f5101 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 81/99] 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 163bbc6028643d389d95c311aed4cde75c7119c2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 82/99] 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 c4cdcdbe93402a3d7383dde5dd6a1ea8b489a726 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 83/99] 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 3e671d9a3bfb5efabca2d66c9bf2c9d8387c073c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 84/99] 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 d4cc116c83dca417361620a71e62532c10c48792 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 85/99] 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 c12c956003017e659c8e1c1573d5619d7859bd80 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 86/99] 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 beb98677af6d2c026e47547e77f834e7989e0498 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 87/99] 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 04a5284aa04ef28bfd5518e0d434330694501ad3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 88/99] 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 2a4d97d5dd1f278397e38a8931085aed50b461b1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 89/99] 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 2dae338bcb12b810f95645a9a90e71b9630d9020 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 90/99] 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 235fd7f40d066ca58e7208972510c8fb924d7300 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 91/99] 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 4328fddde209dd996c1597bb8cffcc67d846b8ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 92/99] 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 0fb07460a7cb6db9d4e57cd85b429fd1850f9b43 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 93/99] 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 362d8c459a90cb5608069578aa80e91e96359435 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 94/99] 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 57a55cb42829c407919092f5e6552a682db7ab93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 95/99] 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 709c26a272600d60d085da4cf31e20544ca98f1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 96/99] 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"

From 1d6f69278d5d1a30ae32d6d13dd766571f59f8df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 97/99] 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 70bdf1d8b55850ed332064269ea302089e58a241 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 98/99] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 9e9820785508acc0707dd51704ed13e680568388 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 99/99] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (23 preceding siblings ...)
  2021-04-04  7:21 ` Gottox
@ 2021-04-04  7:58 ` Gottox
  2021-04-04  8:39 ` Gottox
                   ` (88 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04  7:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 671 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
* [ ] x86_64

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test

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: 130380 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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/99] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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/99] 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 c50848f48c7f84328ab8028585c4a4e107913388 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/99] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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/99] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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/99] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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/99] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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/99] 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 0900339f94877004a475abf1e806003d852c932e 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/99] 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 7eba990e6418b575f09268f1a0b6149128d91473 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/99] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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/99] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 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/99] 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 5145f8067a7f13c978c43dded8320e17d1f798ed 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/99] 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 ba617b9be23f25baf18894df361cea60e1934c52 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/99] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb 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/99] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd 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/99] 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 e8ec0bb87e372c007254a7159cab109fd328622a 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/99] 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 60c4ea3fed79ce7a6f52a626b57249edd0b14d96 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/99] glib: update to 2.68.0.

---
 srcpkgs/glib/patches/disable-broken-tests.patch | 9 ++++++---
 srcpkgs/glib/template                           | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..9d122d54a189 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
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 7c3173e4700600561f67bde31ecd0b71989a48d2 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/99] 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 3a9ab1c80d02d284d94f8c86ca948a1f32612250 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/99] 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 e675151b0fac9c8dbbcd43e49aba371161fc7f4a 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/99] 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 ad384f9385a1b80598345cacc47f74b94a4509ed 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/99] 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 58c50865251c..2a22662a27db 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 fd709ff97908e816761ae106e555b65c2b811026 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/99] 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 2a22662a27db..2d19086f4dbf 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 9a3bb181e11a966216868d4aa028eebbdba48f98 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/99] 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 80a605f9633b4a484b89aa48407b01c483e6532d 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/99] 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 e2c4c005109a3f2b2d354a7e478a9a2c37e4f5e3 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/99] 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 6879e257f77179a12f0457b084e176c4c739d464 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/99] 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 ba64ab36a970bffd48918570026b3f7d1fcb0ccf 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/99] 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 f967c2dcfd8670b59f26ecf1252033677ae90497 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/99] 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 32a1c58dc653c863236c4c31849eb0623d0646d5 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/99] 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 619073f1f1b0df46646b68733def369e273bf264 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/99] 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 ed3c1017fc376b2413e932a8fa98e3e49a07c4f3 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/99] 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 7d6397455d500cd42f9d5dcecc6d14975d91c117 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/99] 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 a9ee12cd427e23f818489c1e1995c65840f879a9 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/99] 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 b88602e9b783f63e6cb61dcf637d5b8863f75a49 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/99] 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 41a26f22a80924b046c96663c56c606bee6c62aa 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/99] 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 58507ec72f29f3c8c1b66f91e825aba2bcd757fa 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/99] 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 f30bf370532363e68778dac6a0443a9022a95907 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/99] 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 2ebf8c8bf16d21484a64c17c64db2ea0ab9d4d38 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/99] 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 891e197c2f6f328d9c085e3fca25d431ab424461 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/99] 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 ac2c8f5800a337a0fb6070ffd21e5f0c0da317de 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/99] 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 6bfda6579ec23b7daf268e1c6b1da33518fd36e1 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/99] 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 4631e4c05abcc3c517d941093b2db7923049fdea 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/99] 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 90c21dd2f883e73aade1b461584115eae52ee0b9 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/99] 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 1749db966c9500c55353b995c8c7a3d94ea11177 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/99] 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 0c5123d49a03f75787e1918c6c3a202601b5a144 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/99] 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 3008ed4fcdbfc535d81fde70a242e8eec8f79928 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/99] 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 c6de3dcbaed7429308e9143215b787d32f0bc2aa 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/99] 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 b6c8084da7d9e7a4deb188d95688df0456dfc1bf 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/99] 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 f4ea79bd895c2c8ea834546c32497b5c05709c32 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/99] 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 2d19086f4dbf..3a99fc15eec6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 be565cf52fdca32b572bef505faa7f93006263d6 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/99] 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 3a99fc15eec6..83582f7961a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 08f01ee7f5113a5f185e6933d49d123c373448ee 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/99] 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 71bffcfe436483daa6f4d5f52e696b107dfbf2a0 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/99] 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 765e68743153e91238da4a7280e5d476614a03a5 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/99] 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 45c8a28be4f01194b150720408eacabc593e3443 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/99] 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 93998206dd1ffdf9cecede6fe25a4ec34eef5544 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/99] 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 a1e42a1b2fc6a3fe2a2a9aab05baa249153809b8 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/99] 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 d96c7fcbc5eb451fcf2194c1996efeee8daaa815 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/99] 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 ccfdb88698843835a96fc5264bd27fb808960dc5 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/99] 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 5d8a6aee50d4f85da77261826c0888ad331ec68c 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/99] 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 d48c87b84647d70ccb60e2a9c93ed5859fe6f1af 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/99] 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 b297671cb29587b04578aee95b0052049798deb3 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/99] 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 effa422f163a5a9edf8c61a4ed341457184dcd5b 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/99] 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 4af2029dcba20533d9b1c390fde8ab536af65e03 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/99] 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 b3202290a6149907fea0353beec6d8d8b151d341 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/99] 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 5cde2ad81aeaf0e45903c175dad07d5c483148b1 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/99] 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 ecd8ef7b951df63c96a647f84dad8e20be079a50 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/99] 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 e6355d0dfd11b3cf5827c65f9fae0e0241be15f9 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/99] 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 858a1e38664ff4c52999e0377a744df04cfb884b 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/99] 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 63629e0f338fef8000259bc4b9afd932d2582f1c 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/99] 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 17e9ced91406f4f872ff2df6c3d61c292c982cf4 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/99] 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 721ef05d5a03fad9d4691a04f95bc43d52d7b32b 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/99] 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 cbe9f1d059bcfe71cd1c0b99c30289516ed11a87 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/99] 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 a80a1b536cb288f5794bc14bc42994bd8ca19166 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/99] 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 3937b5239a28fd7b41ab5901a5a0bdcc34dd8c92 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/99] 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 cf243d6805c4c3080514ed308e6fcd2c4a11f492 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/99] 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 3190e752c55605bfc41e6140dd57b76dbaaacb94 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/99] 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 ff6ab8278f4b917b243ddf8736fdc2ce208a21a1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 77/99] 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 4a00b076eff139f42651431de76d741cdf082873 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 78/99] 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 557bcecc5b9add87faf2d06701ca0a808a8c76ef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 79/99] 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 e3eacf2296fb57470ea7a3409554ed2cae601e55 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 80/99] 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 7a63850776cd0622a765215a361d66241f373ad6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 81/99] 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 b759e6152aa6d259eb627e58d6d7735a572f0b1d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 82/99] 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 a8f4d2e0b308512a432aabaf5e3a39e80b7ca909 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 83/99] 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 c48e312fb4db3f119a37c9e9d41037b8fbfd1a8e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 84/99] 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 03e7f6230eb9724f7f7eff80cc1ff3ce3d2ca841 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 85/99] 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 c8af376bb344fc917563515ae8638ba65b9084f6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 86/99] 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 fc5a173cf9b6e1af8db54c90931240dccf34fe9c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 87/99] 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 f866cdf728fa4a4b3e7c337479e5aa45094da8b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 88/99] 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 0715dd460413eaf157834f4bf51bacac1e6bc515 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 89/99] 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 66457e66a05c323ef324ab1e7ac76da8927f942c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 90/99] 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 a449a42a7984b2c2cd9678bdce0f67009731695c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 91/99] 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 0387b0bfcc8186f7587fcfadc137060847b3b09e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 92/99] 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 b3431b1b939b03e04121350d7bfe8d1b5804d3b0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 93/99] 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 8fa39638c93d6fcdf7e116e5bb2a87e5b0ad1e69 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 94/99] 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 497ff5e3f99b50f73c749beed6fbb26107c15ece Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 95/99] 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 f55b8f5de27471bb577a37abd944e94a8d9d0669 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 96/99] 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"

From 2f92aa00a3491310e8355525afe16e2ebcbfe67f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 97/99] 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 5a0fd64d5296fd13c1988d3f1f9bc7a7a05e1220 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 98/99] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From f315f44b30dd038d42c375567076f54a9aa0bfe0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 99/99] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (24 preceding siblings ...)
  2021-04-04  7:58 ` Gottox
@ 2021-04-04  8:39 ` Gottox
  2021-04-04  9:14 ` Gottox
                   ` (87 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04  8:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 671 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
* [ ] x86_64

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test

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: 130918 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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/99] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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/99] 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 c50848f48c7f84328ab8028585c4a4e107913388 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/99] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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/99] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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/99] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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/99] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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/99] 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 0900339f94877004a475abf1e806003d852c932e 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/99] 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 7eba990e6418b575f09268f1a0b6149128d91473 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/99] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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/99] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 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/99] 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 5145f8067a7f13c978c43dded8320e17d1f798ed 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/99] 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 ba617b9be23f25baf18894df361cea60e1934c52 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/99] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb 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/99] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd 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/99] 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 e8ec0bb87e372c007254a7159cab109fd328622a 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/99] 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 e72f026383569263d7e3c5a383671ad1dacdbb4d 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/99] glib: update to 2.68.0.

---
 srcpkgs/glib/patches/disable-broken-tests.patch | 9 ++++++---
 srcpkgs/glib/template                           | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..9d122d54a189 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 ab881971ec5b8e4c03b8f4f157cc349be3c4f262 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/99] 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 4395a8db4212e96aec816ae3f1a6ef690ec7ea6c 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/99] 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 9707f4016e933068ac9bebb309185e6e51b82b08 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/99] 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 2580e5306b8675ccd017e148366650286ea4466d 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/99] 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 58c50865251c..2a22662a27db 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 f8923f76dbb003bf677a7887e73b56ba353b91fc 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/99] 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 2a22662a27db..2d19086f4dbf 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 0493f0d1712140861645bad6201e91db0960e004 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/99] 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 042a86c625ec3d173913ca1860e09aab7825328e 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/99] 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 833b85b2ff3ce74abf8a9ce3b35abf6dd6fa988d 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/99] 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 b9d8172f46e3b835ffb5f056047f24b678f588f4 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/99] 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 7b885cd636a4c94a3baa07357d9ed6fbe35c77b4 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/99] 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 85d0ef3e84db3c27a94fac9621c7b362b4ffafb3 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/99] 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 ca1e3f360f1c46f9b615004ada96292763d88d8c 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/99] 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 91b5d26c6b1ed63941f9c0ad64cfde4293263198 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/99] 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 de72fda53feb267577f63d469a84a9732fa0acde 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/99] 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 96e9ed35c9035f2ef874628f1310410001bdda65 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/99] 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 8178e73dbb412644fe3dcf06cb77f7e2fc9dd361 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/99] 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 fe2bde2eaea01f39e881431fe30fcc6995156439 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/99] 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 3e4105c02b760f44b7dad1e15c4c4cab6d5df60a 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/99] 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 670b24dd98c1e79f8a38010c1e3c1c9f91ab222c 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/99] 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 9db10310d35a9780c57c1740bd2d275b274bde4b 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/99] 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 38be788ab8812acacb71de62005388b221a3c070 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/99] 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 103135d80aea35ac5caf91bb2765a65650a3b762 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/99] 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 86d337132a567a73d4843ae79e6627a4aaeb23fa 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/99] 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 c58375b9dbc717b0f08276787e5069917962cfc1 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/99] 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 30853e47b742daf1b3e59559468d2ef14843ef75 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/99] 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 491ff8ba0ea7fb213c2a3fd0264270ed64377430 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/99] 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 e5c011732748fd42c772ed32ec24e1f84a7d0975 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/99] 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 e4f3e579982bc46f2216924fee81b02944dbd680 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/99] 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 ce7c201bbf72ad284ebd0491d120728c64cd0a13 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/99] 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 95d02db148b1b4c02195fcc8906d5831aad97d7f 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/99] 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 b451cbfc29df08caeda3f360e8cc5261a0eaf0d1 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/99] 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 398cfa0c6856b1f14a83816e0a2ba9d9cff5ae65 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/99] 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 2d19086f4dbf..3a99fc15eec6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 07f0253e70537328ebe114c20e6eecb019e7ba76 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/99] 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 3a99fc15eec6..83582f7961a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 c3be93ab492e06b518d2041b2c40228baf772487 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/99] 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 e0fca7de591ec200c4a43364e0b7e125bfee2b42 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/99] 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 6ff1c76d44820479196ea64b144cb474c5aa06bf 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/99] 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 a5fec452c6d4bcef21e27f676633e5230d740f13 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/99] 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 a78dc96714e39cddd7b379c697a91215ef1ea2d1 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/99] 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 7df63ada47ee9cf45a20e38de805abab98208a12 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/99] 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 570caf1369f6f7253c8326a172a3ee806c6a2c0b 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/99] 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 a35cc70ecce6f4f41288555322e09974eacd4901 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/99] 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 0a50a12085c2aabf87828ccb9bc428951c510155 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/99] 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 551f3cf3b58faaef1d32b69ba8ab15064218d2f8 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/99] 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 63e016c9da69166958498d3a26c86f559656eebf 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/99] 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 3fd6f63059a8f488dd0fc2b37de32bdf785be14b 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/99] 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 6aebccb254bf523c181039e0c5c04aaa996a8210 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/99] 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 311d7b9b8b3f0fecb20b6873290be84854adb7c4 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/99] 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 38d5e0093e702148d339a13b3f3743a9e4b1b0a0 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/99] 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 a96703a23e0149ee9b0b7ee16591cf0e9cfc457e 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/99] 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 ab70c593fb1ec9287eb89928d12e6d5d4156faa6 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/99] 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 74092f88c8b68f0a91cbaee783e66f065b25f13b 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/99] 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 2061b503695a867f06ef6e70b63a18f60074f419 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/99] 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 f15ea1b45c2e36f3ef1f27253b05cd03156460aa 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/99] 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 1d2e96dd98b9697b6d88e8ee8a24a81c3592babd 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/99] 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 8c5d1c01c6e56d5328d6e3d8d213fe6371a2ccac 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/99] 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 b76a3d12c1de360b3bf247d85c033160c1616c2c 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/99] 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 c8f51a8843a3b1bf4835d766ccedc14fbd83fd73 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/99] 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 67e04f5267842b188525fd14f956900f66de49a6 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/99] 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 b5d31fa30c2cb233c44df95893bc99ade38903af 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/99] 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 c25f6d8d49eda9cb3b3413a1ee42d7ede09330fd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 77/99] 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 26ab372b5c08ce2d738682609d01a280169a797d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 78/99] 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 912f4627df3669fc9ee48aa04bcaf3d784ac4526 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 79/99] 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 86822ebf89b88d5de27fda1ba045539b8c41a36c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 80/99] 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 8c3a8052a096d883ca74d2408925882b679b6415 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 81/99] 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 9b3ad49850edf0ff2f506806f5aefed1bb4ae494 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 82/99] 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 9a62a09a9b37597f3442aaf084dcff4176fc50c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 83/99] 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 120e76de6ed561e906bdbf82d7b159f0a063e11b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 84/99] 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 da9b16677ef0d5b4a3bf90b1e2448e1305c64b2c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 85/99] 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 619a2d2702a0b91d535d500a8831e52b2348b72e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 86/99] 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 34e4b7489670ae46967c8b7bac94e6903c7083e8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 87/99] 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 25b68ee13cca208f0b88c31afdb392639c66290e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 88/99] 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 de9a6e6690929362cf30e36ba4a5c98e3a613be2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 89/99] 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 584cf46b7693a91feebc4ff46ab326f6f54f9e34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 90/99] 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 47c9f8ec1404f9cad420ee89956a5586f1ecf9a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 91/99] 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 80c4f8199825e45c29a8bb46826f4bfce2effeae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 92/99] 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 fae607a98f185a7bec6af7fad8d07c9f31a8079c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 93/99] 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 445e593ae799459c2cfa6c0a8988c3568817bf4e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 94/99] 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 02327829de8dd707a1e777a4cb6806ddd0b4f642 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 95/99] 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 34a3ba30e5c0ffdef57ab46110d6a91d69622af5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 96/99] 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"

From 310f4bd8611e89ac562cdecdfcb8cec3b1e6b0f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 97/99] 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 6d05b96ecfbc329db47df24e3e6ed0fd7219b3a0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 98/99] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From c59a2a23686389a778976c96807acd3d14deafce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 99/99] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (25 preceding siblings ...)
  2021-04-04  8:39 ` Gottox
@ 2021-04-04  9:14 ` Gottox
  2021-04-04  9:27 ` Gottox
                   ` (86 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04  9:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 671 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
* [ ] x86_64

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test

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: 131295 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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/99] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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/99] 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 c50848f48c7f84328ab8028585c4a4e107913388 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/99] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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/99] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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/99] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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/99] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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/99] 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 0900339f94877004a475abf1e806003d852c932e 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/99] 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 7eba990e6418b575f09268f1a0b6149128d91473 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/99] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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/99] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 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/99] 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 5145f8067a7f13c978c43dded8320e17d1f798ed 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/99] 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 ba617b9be23f25baf18894df361cea60e1934c52 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/99] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb 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/99] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd 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/99] 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 e8ec0bb87e372c007254a7159cab109fd328622a 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/99] 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 e72f026383569263d7e3c5a383671ad1dacdbb4d 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/99] glib: update to 2.68.0.

---
 srcpkgs/glib/patches/disable-broken-tests.patch | 9 ++++++---
 srcpkgs/glib/template                           | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..9d122d54a189 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 ab881971ec5b8e4c03b8f4f157cc349be3c4f262 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/99] 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 4395a8db4212e96aec816ae3f1a6ef690ec7ea6c 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/99] 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 9707f4016e933068ac9bebb309185e6e51b82b08 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/99] 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 2580e5306b8675ccd017e148366650286ea4466d 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/99] 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 58c50865251c..2a22662a27db 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 f8923f76dbb003bf677a7887e73b56ba353b91fc 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/99] 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 2a22662a27db..2d19086f4dbf 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 0493f0d1712140861645bad6201e91db0960e004 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/99] 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 042a86c625ec3d173913ca1860e09aab7825328e 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/99] 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 c14e328c2273783f7f4685bfd07ab9d39641d46b 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/99] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 27ad7dfbde046127cf2b6986e66411365748c48f 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/99] 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 5cea616dd0295335e9b7130018aa4922990bb1d8 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/99] 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 cbcf35c1b1de6b63d523f14667d11a32879c00cd 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/99] 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 637200a07d04e907a71e29348f2f76b011df9fbc 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/99] 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 5b6df40138b392079f031bed9eff019ac9e4ba05 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/99] 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 22ca6073478da84e77e6ef36015c5d34d5b45940 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/99] 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 782d33695a698fa41bc06091baaee6b5bcdafeb1 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/99] 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 a2e0b8d356615b337cd4ab5b677a6f2712d725bc 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/99] 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 f1009042295f3898e0cf6526913e23043d9cdb9d 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/99] 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 42b2c4bcaf7f5d27ca69adaacf58e73eb38e4a23 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/99] 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 e2cfb9b4ed6da8a45c08123ec8729a2d4a2afe8c 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/99] 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 ad5260a225b1f4f88cd7eb2a611088c433825e9c 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/99] 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 a2baa4dd485a1a03b3a7b44edc8c2ebbacea19f8 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/99] 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 3c696e7e5c1a28ba12e8f8777ea799dedb63f0f0 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/99] 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 a42c3dc74f1a717a47ed38e00befda721b761983 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/99] 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 4f38783435b3ebcb2bafc882e9808cb69306a159 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/99] 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 7bd942019391baea5a745743d87595bd98c13c81 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/99] 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 f10f8dddddcdf2e7cb36042b4afc75e696af8248 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/99] 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 d293da256ff01c7ae998cb7075f2ba1c3bb970d6 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/99] 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 16651da3ab4b01a2fbddb33979d56291a85d7b02 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/99] 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 60aa19467de1ff4602981d3b848451c9fc8aac87 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/99] 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 5e2f8afd91684eb30435572602ab8668fd4e6797 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/99] 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 836f65018b5a047e36e89fef71f5f766500c0c5b 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/99] 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 abc2713d530614a4ef3eb4156488c157a2e318b1 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/99] 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 2d19086f4dbf..3a99fc15eec6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 f4b5db67ba76619ba51911e803d38b54b74836da 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/99] 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 3a99fc15eec6..83582f7961a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 7b88365d6b3574e8e56c515aaa3dfeb9ded0bb6b 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/99] 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 c47992cc99b5e2db05f0f4174a67f9a6c63dda58 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/99] 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 5da15e4196470336fe175708b35babbc7c750ea4 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/99] 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 5ec80c7bc44df7ce68ccad0cc5ebd2a600292b83 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/99] 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 d1e7b5c1ba4f8c652e254c9662ab9d96f00bd6ce 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/99] 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 ce12a005aa3bbb25f1742e5dadd4cbf6a2ec7450 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/99] 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 268c4e422be8a71258e97528e09344472368e6bc 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/99] 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 c223437a9aebc018bb8ec47bc9c67053e80ce860 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/99] 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 6ea301b232096aee4e2bec8d95654e64c5b42178 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/99] 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 a9a398f21227a11ff477b5e49c12962426588680 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/99] 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 bed2ba492c5bae357ce9d6a8638e9d3d7d0d03e0 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/99] 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 f8fd00cef01521b5cd702f5de20c24ebf9f497a0 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/99] 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 9b56aa7ce6460e150647ea4d80e48a0f8c3e97ed 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/99] 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 e8d819da8bcaf0abaa60ae416aa9adbaf417555e 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/99] 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 4f0d78612da5aabaf33b648696007cf05a7e4c0f 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/99] 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 715cd6f3a98de49a48dd42bd9906f4c20aee677f 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/99] 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 b2988c3026f40af26c7c0ef5d7d4da889984b6cb 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/99] 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 55544f3ec9fc0a00109c9c419c5f4c7e9407d4dd 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/99] 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 70b8893e5b24940465352e47b8cfb419a32261d6 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/99] 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 9d7c48da68de8ec7ecc0097d38dcea671babb6bb 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/99] 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 59d2f74e10917e535e2d07251c15e494271096df 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/99] 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 2f6a7772fb3adc032f1826c1e993fc6dd85b858d 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/99] 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 57fd05596c919214b3fab3225f782a3bce89ea79 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/99] 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 75b5e7e83ffdfc48738178186309094dd4cad265 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/99] 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 648c95a69006e57e37199efe91b2cafd36213afe 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/99] 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 616574ae40121c67879189703956d6e70138f8a5 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/99] 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 90f1d8891e1a9334ad733ef3498245fc1ca588aa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 77/99] 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 75f8b0bd725fa546652c6bc83b8b6609743d0246 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 78/99] 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 16457d886473e52ede9ed729b81036dcbac50eb4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 79/99] 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 e34ec89a5a35c47ec06e07625ebd7b18c1e900ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 80/99] 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 aa9a2ebfa262488198f034a5cb18bf4427ee183c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 81/99] 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 6779bbe3e1b5694a4209763cbca77d805c81b31b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 82/99] 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 efb9896045890bf26f6fce5fa158cd367eb66b9e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 83/99] 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 3203310223ed2c9964980dbd13b269aa1513924c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 84/99] 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 914b03d53a0ed42a3cb0edf8d0f46f53074ad126 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 85/99] 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 8744b64f6647a4e1c1d329827cc781454f5cfc8b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 86/99] 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 96fc39c090a617ccc8a69efc97fce1351904b9c4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 87/99] 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 ca68e7e4c252134c68fd8882ccaf6c33d9b31e40 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 88/99] 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 fc5450502e80f2371467a148cc7acd7ef0e69264 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 89/99] 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 feeabe2cea6be1f69bdf9f694fb8e1891c6c2a36 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 90/99] 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 260b00ed3abb7aa640e5dd4e891f4a516fbb53bc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 91/99] 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 a597279b5e2b0c1b3950ba8694bfd54232b6fb29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 92/99] 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 70139c6abaac6cd41ec2536f2005b0235f9b585c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 93/99] 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 253132e12aeabee698495be11bd3fd2c55919a2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 94/99] 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 018ce1f44167a66d27c84f9691fdc47546040383 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 95/99] 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 a18c0d6f479ad01957331b8d73936f90f787e001 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 96/99] 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"

From 198a88b2d478b848f1a2620836c25165368b09ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 97/99] 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 313098b9858ae8108835ee9238365dbce79e2cf5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 98/99] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 9c56aeec2713c338b796717efb743dd4b8a60d6a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 99/99] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (26 preceding siblings ...)
  2021-04-04  9:14 ` Gottox
@ 2021-04-04  9:27 ` Gottox
  2021-04-04  9:50 ` [PR PATCH] [Updated] " Gottox
                   ` (85 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04  9:27 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
Blocked by: #29689

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (27 preceding siblings ...)
  2021-04-04  9:27 ` Gottox
@ 2021-04-04  9:50 ` Gottox
  2021-04-04 10:00 ` Gottox
                   ` (84 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04  9:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 762 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
* [ ] x86_64
  * [x] compile
  * [ ] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail
* [ ] gspell tests fail

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: 133468 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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 001/100] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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 002/100] 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 c50848f48c7f84328ab8028585c4a4e107913388 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 003/100] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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 004/100] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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 005/100] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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 006/100] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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 007/100] 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 0900339f94877004a475abf1e806003d852c932e 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 008/100] 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 7eba990e6418b575f09268f1a0b6149128d91473 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 009/100] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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 010/100] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/100] 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 5145f8067a7f13c978c43dded8320e17d1f798ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/100] 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 ba617b9be23f25baf18894df361cea60e1934c52 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/100] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/100] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/100] 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 e8ec0bb87e372c007254a7159cab109fd328622a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/100] 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 964afc726ea36db27a5d2a26eb2900c0a23916c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/100] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch |  9 ++++++---
 srcpkgs/glib/template                           |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..9d122d54a189 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 d664a58684168d374cf44815e4526ecd3b01f46c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/100] 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 0f738d203227b60b8f849665b03dac58ae7b0891 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/100] 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 6cf368c1bf79aee5caaabf2fa258238f845a54bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/100] 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 ded06f5be35bba70ac2e85300acfa14c84d33bed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/100] 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 4126667b57c6..97b2c3b05351 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 b2b58262d7142d5d9e39bfd06f014fb27073fb67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/100] 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 97b2c3b05351..07cef8a8bc3e 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 9bbbbdbf302e47f382e42cef5f8b3c6db9a15e3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/100] 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 55f701db63d77db839d5442ef9c9a10a42039cbb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/100] 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 a6e5227dd407b5da973765452537fa4556d82d5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/100] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 2a4e5aa27fde9b7f95188ba3c4d8411ca516c18c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/100] 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 2255d126106a774e1aafa3c41f47f3e75d8ec122 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/100] 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 549da15fa80ff295a9b7d84aac3537511960081c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/100] 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 d4ab2b9b4088a080307b84be921b3029fbda24c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/100] 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 952095a5cd88c156802b32c4971d2465f1a18123 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/100] 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 23a58da5f9de8d99fdd000302cbc824be10b2950 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/100] 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 927a844bc2185e5aeb9400ce5566d12d779e4462 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/100] 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 8adb1c683e43bb71514aa6f67bdfe01a88029960 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/100] 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 0288c6f5396ff7336c6b2df7abf14a2c30b63702 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/100] 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 7aced586cee7a03c5cb61d46e56cb46d8f3f18d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/100] 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 287fbdb7d972269269934de8dd7cf359621ad19a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/100] 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 d872fba63fe402e74187780d8e72cfd6c3867a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/100] 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 0bc851e832dde196d4e31e45e787b6134833f95f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/100] 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 85aec1ed9fc88ebdf50cf4c5c76ded62fd20be63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/100] 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 56044b5c66103ffa7337c98549a0a7fc44d81ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/100] 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 7d1bf4e5fc984e411e0569e17470a545e9e59c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/100] 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 27c645a26c458808d31513eab5e162ba59c1431c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/100] 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 1223d00c47ff8ebf3693c46b37f94d84b688eb12 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/100] 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 b042587b7e1cdda579f920d15328533b2a1d77cf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/100] 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 a863cf74b3a8b8202d4f54f00f5ed9d607f9eaee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/100] 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 f2b730caed5e1f0532ef45c0928b1fd730259e7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/100] 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 4250aca27804600d911a50340ecc7829dfdcf507 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/100] 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 96247fc50c224ae8d7b930c330801eb786ad01d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/100] 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 dae4c49358da093f4b49161013b7321b694c69bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/100] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 52df52c0ba91c5b8c20c651c6f832bc803a77762 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/100] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 bcca84c8dfebc47dae46a14c822553ccc3b0cec6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/100] 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 1cefca5c95d5f907d345cce38b36a078f3cac287 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/100] 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 7f23dd9e5efea41b858f0ffbf2b34a38636ccd92 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/100] 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 0a6f48d0fd21d32f91a830abe1b4a785576b1fbf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/100] 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 d355ba9a71080c68e1ca5781a96faa5666a0c07c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/100] 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 e3d825bc1a1354f44904a1b62388db7f87f4b444 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/100] 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 8f6a15ff450b2085dc1504e360a03395113943c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/100] 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 a0f9f82cb603ec68c423ca5d885cd6278c69da29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/100] 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 9b30af868de3e181f59d882dec440ec7a96c8b62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/100] 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 a9325f619b6af92af3386ba038c1b5eb3cd56581 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/100] 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 c116955eebaf17483eb641785ce3fc7462a50b37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/100] 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 33e12aaa1cc4c4ef5ac8bef595c6bba6593fa0f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/100] 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 24a8754a67eed9ea63308cd7e7d58df9485e8e3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/100] 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 9da028284e2f6859bb926d9a8e374f24d31b5f16 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/100] 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 c21e58f6d9129e3a9ab8ac28827d69c627631030 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/100] 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 69002557f725eaafef2fae3b15fbfd63838fa811 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/100] 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 f3d773af975fcd2f3e4f37b3cc9947228ef18a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/100] 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 197256f3ef4f879dd810e166b4b9bf576c1d787d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/100] 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 7111ca924638ccc37a57de7f5eb89fb2c572dc21 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/100] 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 166f8e49970b94e6f733a98ea257d2640db64d0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/100] 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 6073336dd3d0677b708324dae79765dd2030b70b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/100] 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 3b4fd9a19cdf087b47ebe5eaa5c492e6c560dcb3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/100] 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 1b13df0f5c576443062f9b5c9d1ec2c3159f3eda Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/100] 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 5fc5e927fb10fc591417ec3f6699402de0211663 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/100] 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 f39d4d4875a095857cda5820e3a0bd626d3c4192 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/100] 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 6274f66aec1168b16099ea9671bd754925f8e7b3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/100] 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 b005a7e4395896ebc2fd8d4deda96fc45ee2e689 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/100] 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 cd19f0389445a873707e37214abb798d1c612865 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/100] 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 b0c227df50cee3f73814b4ee0250e602e0a79f3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/100] 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 d83a414ce017ae89248667ce9869a10387f56de4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/100] 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 8856d1910c029b902adcfbb565b48a40b26716d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/100] 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 b66fda7b4ae8bc4373025108104d308baff559c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/100] 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 7b8d7eb2ee1eb51a36024703005957a7e9e46ffb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/100] 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 e073c849a4201c4c0eb1b85d5dabcfac0cdc1cf1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/100] 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 b643e198b45797f0f72e3e2d8102da239a94096d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/100] 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 448063f4d227d339573de938421c9ad61b59cc9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/100] 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 d8ceb1999da697304b6e6f2781e8e00278276ac3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/100] 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 b7685f9e08f4ae949065ac5bba62b15a1c570d58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/100] 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 50c434d218a2005892538a7afa389380eadab65c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/100] 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 4072f014fe54d9f00b453eb830482efb0fc6bda1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/100] 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 2e1894812697f5530e71bd1d2cbe28ae8d448325 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/100] 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 1708c6c419fcff5e81e2772072bab8193019455f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/100] 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 462b579d0bff2052e02c99f7575310579e33ef46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/100] 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 50b423df7f9e26034359baad8fb9eb0f85e736f3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/100] 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 9932255ec020bf527b4de1e816cce56480bb4199 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/100] 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 ec3b1288be54a410249c2dd6dd359f1581aa2ae2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/100] 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"

From 4c20aae416bb97d4f84d6bf033cccdb0f7c27887 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/100] 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 0b985162dc85bc6122adfb18af7408c6bf1d49be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/100] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 73b2fb9a088bb35a58a7cf281e9dafadb521a99c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/100] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc96a61891886c624df502f76ad56a5ec9529fbc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/100] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (28 preceding siblings ...)
  2021-04-04  9:50 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-04 10:00 ` Gottox
  2021-04-04 10:10 ` Gottox
                   ` (83 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04 10:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 786 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
* [ ] x86_64
  * [x] compile
  * [ ] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail
* [x] gspell tests fail
* [ ] dconf tests fail

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: 134226 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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 001/101] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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 002/101] 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 c50848f48c7f84328ab8028585c4a4e107913388 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 003/101] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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 004/101] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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 005/101] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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 006/101] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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 007/101] 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 0900339f94877004a475abf1e806003d852c932e 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 008/101] 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 7eba990e6418b575f09268f1a0b6149128d91473 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 009/101] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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 010/101] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/101] 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 5145f8067a7f13c978c43dded8320e17d1f798ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/101] 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 ba617b9be23f25baf18894df361cea60e1934c52 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/101] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/101] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/101] 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 e8ec0bb87e372c007254a7159cab109fd328622a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/101] 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 964afc726ea36db27a5d2a26eb2900c0a23916c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/101] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch |  9 ++++++---
 srcpkgs/glib/template                           |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..9d122d54a189 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 d664a58684168d374cf44815e4526ecd3b01f46c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/101] 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 0f738d203227b60b8f849665b03dac58ae7b0891 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/101] 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 6cf368c1bf79aee5caaabf2fa258238f845a54bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/101] 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 ded06f5be35bba70ac2e85300acfa14c84d33bed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/101] 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 4126667b57c6..97b2c3b05351 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 b2b58262d7142d5d9e39bfd06f014fb27073fb67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/101] 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 97b2c3b05351..07cef8a8bc3e 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 9bbbbdbf302e47f382e42cef5f8b3c6db9a15e3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/101] 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 55f701db63d77db839d5442ef9c9a10a42039cbb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/101] 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 a6e5227dd407b5da973765452537fa4556d82d5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/101] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 2a4e5aa27fde9b7f95188ba3c4d8411ca516c18c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/101] 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 2255d126106a774e1aafa3c41f47f3e75d8ec122 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/101] 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 549da15fa80ff295a9b7d84aac3537511960081c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/101] 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 d4ab2b9b4088a080307b84be921b3029fbda24c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/101] 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 952095a5cd88c156802b32c4971d2465f1a18123 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/101] 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 23a58da5f9de8d99fdd000302cbc824be10b2950 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/101] 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 927a844bc2185e5aeb9400ce5566d12d779e4462 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/101] 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 8adb1c683e43bb71514aa6f67bdfe01a88029960 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/101] 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 0288c6f5396ff7336c6b2df7abf14a2c30b63702 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/101] 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 7aced586cee7a03c5cb61d46e56cb46d8f3f18d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/101] 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 287fbdb7d972269269934de8dd7cf359621ad19a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/101] 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 d872fba63fe402e74187780d8e72cfd6c3867a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/101] 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 0bc851e832dde196d4e31e45e787b6134833f95f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/101] 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 85aec1ed9fc88ebdf50cf4c5c76ded62fd20be63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/101] 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 56044b5c66103ffa7337c98549a0a7fc44d81ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/101] 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 7d1bf4e5fc984e411e0569e17470a545e9e59c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/101] 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 27c645a26c458808d31513eab5e162ba59c1431c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/101] 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 1223d00c47ff8ebf3693c46b37f94d84b688eb12 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/101] 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 b042587b7e1cdda579f920d15328533b2a1d77cf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/101] 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 a863cf74b3a8b8202d4f54f00f5ed9d607f9eaee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/101] 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 f2b730caed5e1f0532ef45c0928b1fd730259e7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/101] 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 4250aca27804600d911a50340ecc7829dfdcf507 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/101] 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 96247fc50c224ae8d7b930c330801eb786ad01d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/101] 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 dae4c49358da093f4b49161013b7321b694c69bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/101] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 52df52c0ba91c5b8c20c651c6f832bc803a77762 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/101] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 bcca84c8dfebc47dae46a14c822553ccc3b0cec6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/101] 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 1cefca5c95d5f907d345cce38b36a078f3cac287 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/101] 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 7f23dd9e5efea41b858f0ffbf2b34a38636ccd92 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/101] 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 0a6f48d0fd21d32f91a830abe1b4a785576b1fbf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/101] 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 d355ba9a71080c68e1ca5781a96faa5666a0c07c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/101] 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 e3d825bc1a1354f44904a1b62388db7f87f4b444 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/101] 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 8f6a15ff450b2085dc1504e360a03395113943c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/101] 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 a0f9f82cb603ec68c423ca5d885cd6278c69da29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/101] 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 9b30af868de3e181f59d882dec440ec7a96c8b62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/101] 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 a9325f619b6af92af3386ba038c1b5eb3cd56581 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/101] 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 c116955eebaf17483eb641785ce3fc7462a50b37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/101] 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 33e12aaa1cc4c4ef5ac8bef595c6bba6593fa0f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/101] 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 24a8754a67eed9ea63308cd7e7d58df9485e8e3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/101] 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 9da028284e2f6859bb926d9a8e374f24d31b5f16 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/101] 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 c21e58f6d9129e3a9ab8ac28827d69c627631030 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/101] 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 69002557f725eaafef2fae3b15fbfd63838fa811 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/101] 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 f3d773af975fcd2f3e4f37b3cc9947228ef18a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/101] 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 197256f3ef4f879dd810e166b4b9bf576c1d787d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/101] 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 7111ca924638ccc37a57de7f5eb89fb2c572dc21 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/101] 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 166f8e49970b94e6f733a98ea257d2640db64d0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/101] 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 6073336dd3d0677b708324dae79765dd2030b70b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/101] 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 3b4fd9a19cdf087b47ebe5eaa5c492e6c560dcb3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/101] 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 1b13df0f5c576443062f9b5c9d1ec2c3159f3eda Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/101] 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 5fc5e927fb10fc591417ec3f6699402de0211663 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/101] 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 f39d4d4875a095857cda5820e3a0bd626d3c4192 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/101] 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 6274f66aec1168b16099ea9671bd754925f8e7b3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/101] 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 b005a7e4395896ebc2fd8d4deda96fc45ee2e689 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/101] 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 cd19f0389445a873707e37214abb798d1c612865 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/101] 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 b0c227df50cee3f73814b4ee0250e602e0a79f3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/101] 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 d83a414ce017ae89248667ce9869a10387f56de4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/101] 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 8856d1910c029b902adcfbb565b48a40b26716d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/101] 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 b66fda7b4ae8bc4373025108104d308baff559c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/101] 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 7b8d7eb2ee1eb51a36024703005957a7e9e46ffb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/101] 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 e073c849a4201c4c0eb1b85d5dabcfac0cdc1cf1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/101] 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 b643e198b45797f0f72e3e2d8102da239a94096d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/101] 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 448063f4d227d339573de938421c9ad61b59cc9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/101] 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 d8ceb1999da697304b6e6f2781e8e00278276ac3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/101] 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 b7685f9e08f4ae949065ac5bba62b15a1c570d58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/101] 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 50c434d218a2005892538a7afa389380eadab65c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/101] 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 4072f014fe54d9f00b453eb830482efb0fc6bda1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/101] 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 2e1894812697f5530e71bd1d2cbe28ae8d448325 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/101] 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 1708c6c419fcff5e81e2772072bab8193019455f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/101] 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 462b579d0bff2052e02c99f7575310579e33ef46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/101] 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 50b423df7f9e26034359baad8fb9eb0f85e736f3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/101] 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 9932255ec020bf527b4de1e816cce56480bb4199 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/101] 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 ec3b1288be54a410249c2dd6dd359f1581aa2ae2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/101] 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"

From 4c20aae416bb97d4f84d6bf033cccdb0f7c27887 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/101] 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 0b985162dc85bc6122adfb18af7408c6bf1d49be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/101] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 73b2fb9a088bb35a58a7cf281e9dafadb521a99c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/101] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc96a61891886c624df502f76ad56a5ec9529fbc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/101] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 86ca8b545c6087c53e4a2e90810953328ad9baf0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/101] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (29 preceding siblings ...)
  2021-04-04 10:00 ` Gottox
@ 2021-04-04 10:10 ` Gottox
  2021-04-04 11:31 ` Gottox
                   ` (82 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04 10:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 786 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
* [ ] x86_64
  * [x] compile
  * [ ] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail
* [x] gspell tests fail
* [ ] dconf tests fail

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: 135442 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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 001/102] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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 002/102] 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 c50848f48c7f84328ab8028585c4a4e107913388 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 003/102] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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 004/102] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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 005/102] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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 006/102] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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 007/102] 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 0900339f94877004a475abf1e806003d852c932e 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 008/102] 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 7eba990e6418b575f09268f1a0b6149128d91473 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 009/102] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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 010/102] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/102] 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 5145f8067a7f13c978c43dded8320e17d1f798ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/102] 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 ba617b9be23f25baf18894df361cea60e1934c52 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/102] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/102] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/102] 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 e8ec0bb87e372c007254a7159cab109fd328622a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/102] 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 964afc726ea36db27a5d2a26eb2900c0a23916c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/102] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch |  9 ++++++---
 srcpkgs/glib/template                           |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..9d122d54a189 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 d664a58684168d374cf44815e4526ecd3b01f46c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/102] 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 0f738d203227b60b8f849665b03dac58ae7b0891 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/102] 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 6cf368c1bf79aee5caaabf2fa258238f845a54bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/102] 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 ded06f5be35bba70ac2e85300acfa14c84d33bed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/102] 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 4126667b57c6..97b2c3b05351 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 b2b58262d7142d5d9e39bfd06f014fb27073fb67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/102] 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 97b2c3b05351..07cef8a8bc3e 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 9bbbbdbf302e47f382e42cef5f8b3c6db9a15e3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/102] 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 55f701db63d77db839d5442ef9c9a10a42039cbb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/102] 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 a6e5227dd407b5da973765452537fa4556d82d5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/102] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 2a4e5aa27fde9b7f95188ba3c4d8411ca516c18c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/102] 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 2255d126106a774e1aafa3c41f47f3e75d8ec122 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/102] 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 549da15fa80ff295a9b7d84aac3537511960081c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/102] 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 d4ab2b9b4088a080307b84be921b3029fbda24c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/102] 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 952095a5cd88c156802b32c4971d2465f1a18123 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/102] 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 23a58da5f9de8d99fdd000302cbc824be10b2950 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/102] 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 927a844bc2185e5aeb9400ce5566d12d779e4462 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/102] 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 8adb1c683e43bb71514aa6f67bdfe01a88029960 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/102] 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 0288c6f5396ff7336c6b2df7abf14a2c30b63702 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/102] 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 7aced586cee7a03c5cb61d46e56cb46d8f3f18d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/102] 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 287fbdb7d972269269934de8dd7cf359621ad19a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/102] 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 d872fba63fe402e74187780d8e72cfd6c3867a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/102] 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 0bc851e832dde196d4e31e45e787b6134833f95f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/102] 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 85aec1ed9fc88ebdf50cf4c5c76ded62fd20be63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/102] 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 56044b5c66103ffa7337c98549a0a7fc44d81ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/102] 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 7d1bf4e5fc984e411e0569e17470a545e9e59c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/102] 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 27c645a26c458808d31513eab5e162ba59c1431c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/102] 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 1223d00c47ff8ebf3693c46b37f94d84b688eb12 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/102] 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 b042587b7e1cdda579f920d15328533b2a1d77cf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/102] 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 a863cf74b3a8b8202d4f54f00f5ed9d607f9eaee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/102] 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 f2b730caed5e1f0532ef45c0928b1fd730259e7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/102] 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 4250aca27804600d911a50340ecc7829dfdcf507 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/102] 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 96247fc50c224ae8d7b930c330801eb786ad01d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/102] 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 dae4c49358da093f4b49161013b7321b694c69bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/102] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 52df52c0ba91c5b8c20c651c6f832bc803a77762 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/102] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 bcca84c8dfebc47dae46a14c822553ccc3b0cec6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/102] 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 1cefca5c95d5f907d345cce38b36a078f3cac287 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/102] 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 7f23dd9e5efea41b858f0ffbf2b34a38636ccd92 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/102] 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 0a6f48d0fd21d32f91a830abe1b4a785576b1fbf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/102] 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 d355ba9a71080c68e1ca5781a96faa5666a0c07c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/102] 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 e3d825bc1a1354f44904a1b62388db7f87f4b444 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/102] 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 8f6a15ff450b2085dc1504e360a03395113943c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/102] 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 a0f9f82cb603ec68c423ca5d885cd6278c69da29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/102] 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 9b30af868de3e181f59d882dec440ec7a96c8b62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/102] 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 a9325f619b6af92af3386ba038c1b5eb3cd56581 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/102] 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 c116955eebaf17483eb641785ce3fc7462a50b37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/102] 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 33e12aaa1cc4c4ef5ac8bef595c6bba6593fa0f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/102] 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 24a8754a67eed9ea63308cd7e7d58df9485e8e3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/102] 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 9da028284e2f6859bb926d9a8e374f24d31b5f16 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/102] 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 c21e58f6d9129e3a9ab8ac28827d69c627631030 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/102] 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 69002557f725eaafef2fae3b15fbfd63838fa811 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/102] 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 f3d773af975fcd2f3e4f37b3cc9947228ef18a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/102] 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 197256f3ef4f879dd810e166b4b9bf576c1d787d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/102] 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 7111ca924638ccc37a57de7f5eb89fb2c572dc21 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/102] 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 166f8e49970b94e6f733a98ea257d2640db64d0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/102] 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 6073336dd3d0677b708324dae79765dd2030b70b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/102] 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 3b4fd9a19cdf087b47ebe5eaa5c492e6c560dcb3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/102] 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 1b13df0f5c576443062f9b5c9d1ec2c3159f3eda Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/102] 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 5fc5e927fb10fc591417ec3f6699402de0211663 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/102] 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 f39d4d4875a095857cda5820e3a0bd626d3c4192 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/102] 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 6274f66aec1168b16099ea9671bd754925f8e7b3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/102] 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 b005a7e4395896ebc2fd8d4deda96fc45ee2e689 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/102] 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 cd19f0389445a873707e37214abb798d1c612865 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/102] 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 b0c227df50cee3f73814b4ee0250e602e0a79f3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/102] 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 d83a414ce017ae89248667ce9869a10387f56de4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/102] 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 8856d1910c029b902adcfbb565b48a40b26716d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/102] 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 b66fda7b4ae8bc4373025108104d308baff559c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/102] 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 7b8d7eb2ee1eb51a36024703005957a7e9e46ffb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/102] 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 e073c849a4201c4c0eb1b85d5dabcfac0cdc1cf1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/102] 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 b643e198b45797f0f72e3e2d8102da239a94096d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/102] 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 448063f4d227d339573de938421c9ad61b59cc9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/102] 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 d8ceb1999da697304b6e6f2781e8e00278276ac3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/102] 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 b7685f9e08f4ae949065ac5bba62b15a1c570d58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/102] 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 50c434d218a2005892538a7afa389380eadab65c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/102] 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 4072f014fe54d9f00b453eb830482efb0fc6bda1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/102] 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 2e1894812697f5530e71bd1d2cbe28ae8d448325 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/102] 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 1708c6c419fcff5e81e2772072bab8193019455f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/102] 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 462b579d0bff2052e02c99f7575310579e33ef46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/102] 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 50b423df7f9e26034359baad8fb9eb0f85e736f3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/102] 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 9932255ec020bf527b4de1e816cce56480bb4199 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/102] 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 ec3b1288be54a410249c2dd6dd359f1581aa2ae2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/102] 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"

From 4c20aae416bb97d4f84d6bf033cccdb0f7c27887 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/102] 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 0b985162dc85bc6122adfb18af7408c6bf1d49be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/102] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 73b2fb9a088bb35a58a7cf281e9dafadb521a99c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/102] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc96a61891886c624df502f76ad56a5ec9529fbc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/102] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 86ca8b545c6087c53e4a2e90810953328ad9baf0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/102] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 81df3a02ed655d4bbe3702932c15d586338f7a8c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/102] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (30 preceding siblings ...)
  2021-04-04 10:10 ` Gottox
@ 2021-04-04 11:31 ` Gottox
  2021-04-04 15:19 ` Gottox
                   ` (81 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04 11:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 786 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
* [ ] x86_64
  * [x] compile
  * [ ] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail
* [x] gspell tests fail
* [ ] dconf tests fail

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: 136390 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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 001/103] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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 002/103] 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 c50848f48c7f84328ab8028585c4a4e107913388 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 003/103] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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 004/103] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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 005/103] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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 006/103] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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 007/103] 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 0900339f94877004a475abf1e806003d852c932e 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 008/103] 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 7eba990e6418b575f09268f1a0b6149128d91473 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 009/103] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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 010/103] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/103] 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 5145f8067a7f13c978c43dded8320e17d1f798ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/103] 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 ba617b9be23f25baf18894df361cea60e1934c52 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/103] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/103] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/103] 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 e8ec0bb87e372c007254a7159cab109fd328622a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/103] 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 964afc726ea36db27a5d2a26eb2900c0a23916c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/103] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch |  9 ++++++---
 srcpkgs/glib/template                           |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..9d122d54a189 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 d664a58684168d374cf44815e4526ecd3b01f46c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/103] 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 0f738d203227b60b8f849665b03dac58ae7b0891 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/103] 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 6cf368c1bf79aee5caaabf2fa258238f845a54bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/103] 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 ded06f5be35bba70ac2e85300acfa14c84d33bed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/103] 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 4126667b57c6..97b2c3b05351 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 b2b58262d7142d5d9e39bfd06f014fb27073fb67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/103] 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 97b2c3b05351..07cef8a8bc3e 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 9bbbbdbf302e47f382e42cef5f8b3c6db9a15e3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/103] 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 55f701db63d77db839d5442ef9c9a10a42039cbb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/103] 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 a6e5227dd407b5da973765452537fa4556d82d5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/103] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 2a4e5aa27fde9b7f95188ba3c4d8411ca516c18c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/103] 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 2255d126106a774e1aafa3c41f47f3e75d8ec122 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/103] 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 549da15fa80ff295a9b7d84aac3537511960081c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/103] 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 d4ab2b9b4088a080307b84be921b3029fbda24c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/103] 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 952095a5cd88c156802b32c4971d2465f1a18123 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/103] 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 23a58da5f9de8d99fdd000302cbc824be10b2950 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/103] 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 927a844bc2185e5aeb9400ce5566d12d779e4462 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/103] 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 8adb1c683e43bb71514aa6f67bdfe01a88029960 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/103] 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 0288c6f5396ff7336c6b2df7abf14a2c30b63702 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/103] 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 7aced586cee7a03c5cb61d46e56cb46d8f3f18d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/103] 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 287fbdb7d972269269934de8dd7cf359621ad19a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/103] 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 d872fba63fe402e74187780d8e72cfd6c3867a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/103] 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 0bc851e832dde196d4e31e45e787b6134833f95f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/103] 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 85aec1ed9fc88ebdf50cf4c5c76ded62fd20be63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/103] 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 56044b5c66103ffa7337c98549a0a7fc44d81ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/103] 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 7d1bf4e5fc984e411e0569e17470a545e9e59c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/103] 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 27c645a26c458808d31513eab5e162ba59c1431c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/103] 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 1223d00c47ff8ebf3693c46b37f94d84b688eb12 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/103] 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 b042587b7e1cdda579f920d15328533b2a1d77cf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/103] 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 a863cf74b3a8b8202d4f54f00f5ed9d607f9eaee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/103] 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 f2b730caed5e1f0532ef45c0928b1fd730259e7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/103] 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 4250aca27804600d911a50340ecc7829dfdcf507 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/103] 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 96247fc50c224ae8d7b930c330801eb786ad01d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/103] 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 dae4c49358da093f4b49161013b7321b694c69bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/103] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 52df52c0ba91c5b8c20c651c6f832bc803a77762 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/103] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 bcca84c8dfebc47dae46a14c822553ccc3b0cec6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/103] 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 1cefca5c95d5f907d345cce38b36a078f3cac287 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/103] 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 7f23dd9e5efea41b858f0ffbf2b34a38636ccd92 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/103] 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 0a6f48d0fd21d32f91a830abe1b4a785576b1fbf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/103] 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 d355ba9a71080c68e1ca5781a96faa5666a0c07c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/103] 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 e3d825bc1a1354f44904a1b62388db7f87f4b444 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/103] 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 8f6a15ff450b2085dc1504e360a03395113943c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/103] 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 a0f9f82cb603ec68c423ca5d885cd6278c69da29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/103] 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 9b30af868de3e181f59d882dec440ec7a96c8b62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/103] 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 a9325f619b6af92af3386ba038c1b5eb3cd56581 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/103] 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 c116955eebaf17483eb641785ce3fc7462a50b37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/103] 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 33e12aaa1cc4c4ef5ac8bef595c6bba6593fa0f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/103] 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 24a8754a67eed9ea63308cd7e7d58df9485e8e3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/103] 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 9da028284e2f6859bb926d9a8e374f24d31b5f16 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/103] 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 c21e58f6d9129e3a9ab8ac28827d69c627631030 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/103] 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 69002557f725eaafef2fae3b15fbfd63838fa811 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/103] 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 f3d773af975fcd2f3e4f37b3cc9947228ef18a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/103] 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 197256f3ef4f879dd810e166b4b9bf576c1d787d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/103] 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 7111ca924638ccc37a57de7f5eb89fb2c572dc21 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/103] 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 166f8e49970b94e6f733a98ea257d2640db64d0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/103] 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 6073336dd3d0677b708324dae79765dd2030b70b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/103] 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 3b4fd9a19cdf087b47ebe5eaa5c492e6c560dcb3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/103] 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 1b13df0f5c576443062f9b5c9d1ec2c3159f3eda Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/103] 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 5fc5e927fb10fc591417ec3f6699402de0211663 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/103] 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 f39d4d4875a095857cda5820e3a0bd626d3c4192 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/103] 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 6274f66aec1168b16099ea9671bd754925f8e7b3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/103] 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 b005a7e4395896ebc2fd8d4deda96fc45ee2e689 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/103] 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 cd19f0389445a873707e37214abb798d1c612865 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/103] 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 b0c227df50cee3f73814b4ee0250e602e0a79f3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/103] 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 d83a414ce017ae89248667ce9869a10387f56de4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/103] 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 8856d1910c029b902adcfbb565b48a40b26716d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/103] 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 b66fda7b4ae8bc4373025108104d308baff559c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/103] 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 7b8d7eb2ee1eb51a36024703005957a7e9e46ffb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/103] 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 e073c849a4201c4c0eb1b85d5dabcfac0cdc1cf1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/103] 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 b643e198b45797f0f72e3e2d8102da239a94096d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/103] 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 448063f4d227d339573de938421c9ad61b59cc9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/103] 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 d8ceb1999da697304b6e6f2781e8e00278276ac3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/103] 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 b7685f9e08f4ae949065ac5bba62b15a1c570d58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/103] 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 50c434d218a2005892538a7afa389380eadab65c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/103] 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 4072f014fe54d9f00b453eb830482efb0fc6bda1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/103] 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 2e1894812697f5530e71bd1d2cbe28ae8d448325 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/103] 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 1708c6c419fcff5e81e2772072bab8193019455f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/103] 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 462b579d0bff2052e02c99f7575310579e33ef46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/103] 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 50b423df7f9e26034359baad8fb9eb0f85e736f3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/103] 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 9932255ec020bf527b4de1e816cce56480bb4199 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/103] 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 ec3b1288be54a410249c2dd6dd359f1581aa2ae2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/103] 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"

From 4c20aae416bb97d4f84d6bf033cccdb0f7c27887 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/103] 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 0b985162dc85bc6122adfb18af7408c6bf1d49be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/103] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 73b2fb9a088bb35a58a7cf281e9dafadb521a99c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/103] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc96a61891886c624df502f76ad56a5ec9529fbc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/103] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 86ca8b545c6087c53e4a2e90810953328ad9baf0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/103] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 81df3a02ed655d4bbe3702932c15d586338f7a8c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/103] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From 52cbc6d320b51fa81d1248ad8f01eb7d6f191f3d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 103/103] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (31 preceding siblings ...)
  2021-04-04 11:31 ` Gottox
@ 2021-04-04 15:19 ` Gottox
  2021-04-05 10:06 ` Gottox
                   ` (80 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-04 15:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 886 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [ ] x86_64-musl
  * [ ] compile
  * [ ] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [ ] glib tests fail on x86_64-musl

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: 138724 bytes --]

From e2dc7ac512be5beba09a536e29f407d40a705440 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 001/104] 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 9687e6864ce9b2f1f211036df3b3c06392bfac5b 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 002/104] 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 c50848f48c7f84328ab8028585c4a4e107913388 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 003/104] 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 4520457b6fbc9bc8ce45e1f575106e3e8e8e2121 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 004/104] 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 fd556b3e5d027b9dfd8fde608125773cacd3ec5b 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 005/104] 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 9921ab34d97b5ed9be4f11721cfe841e7ddf794d 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 006/104] 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 1090b95597b3968a7b9dc3f8c839a9c4e07154db 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 007/104] 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 0900339f94877004a475abf1e806003d852c932e 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 008/104] 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 7eba990e6418b575f09268f1a0b6149128d91473 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 009/104] 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 97c9e5216fe4901e9983c49762214ec59751d3d5 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 010/104] 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 9aa0a601250b..58c50865251c 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 986f705dc45cb057303949144c657cf70997d555 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/104] 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 5145f8067a7f13c978c43dded8320e17d1f798ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/104] 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 ba617b9be23f25baf18894df361cea60e1934c52 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/104] 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 f5d3921a6ec0fd1c21791370e9889e58cc2ba4bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/104] 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 02915e20cc814cfe76bd0a913d4825f066d6edbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/104] 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 e8ec0bb87e372c007254a7159cab109fd328622a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/104] 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 964afc726ea36db27a5d2a26eb2900c0a23916c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/104] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch |  9 ++++++---
 srcpkgs/glib/template                           |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..9d122d54a189 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 d664a58684168d374cf44815e4526ecd3b01f46c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/104] 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 0f738d203227b60b8f849665b03dac58ae7b0891 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/104] 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 6cf368c1bf79aee5caaabf2fa258238f845a54bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/104] 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 ded06f5be35bba70ac2e85300acfa14c84d33bed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/104] 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 4126667b57c6..97b2c3b05351 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 b2b58262d7142d5d9e39bfd06f014fb27073fb67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/104] 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 97b2c3b05351..07cef8a8bc3e 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 9bbbbdbf302e47f382e42cef5f8b3c6db9a15e3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/104] 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 55f701db63d77db839d5442ef9c9a10a42039cbb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/104] 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 a6e5227dd407b5da973765452537fa4556d82d5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/104] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 2a4e5aa27fde9b7f95188ba3c4d8411ca516c18c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/104] 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 2255d126106a774e1aafa3c41f47f3e75d8ec122 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/104] 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 549da15fa80ff295a9b7d84aac3537511960081c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/104] 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 d4ab2b9b4088a080307b84be921b3029fbda24c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/104] 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 952095a5cd88c156802b32c4971d2465f1a18123 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/104] 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 23a58da5f9de8d99fdd000302cbc824be10b2950 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/104] 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 927a844bc2185e5aeb9400ce5566d12d779e4462 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/104] 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 8adb1c683e43bb71514aa6f67bdfe01a88029960 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/104] 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 0288c6f5396ff7336c6b2df7abf14a2c30b63702 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/104] 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 7aced586cee7a03c5cb61d46e56cb46d8f3f18d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/104] 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 287fbdb7d972269269934de8dd7cf359621ad19a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/104] 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 d872fba63fe402e74187780d8e72cfd6c3867a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/104] 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 0bc851e832dde196d4e31e45e787b6134833f95f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/104] 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 85aec1ed9fc88ebdf50cf4c5c76ded62fd20be63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/104] 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 56044b5c66103ffa7337c98549a0a7fc44d81ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/104] 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 7d1bf4e5fc984e411e0569e17470a545e9e59c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/104] 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 27c645a26c458808d31513eab5e162ba59c1431c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/104] 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 1223d00c47ff8ebf3693c46b37f94d84b688eb12 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/104] 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 b042587b7e1cdda579f920d15328533b2a1d77cf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/104] 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 a863cf74b3a8b8202d4f54f00f5ed9d607f9eaee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/104] 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 f2b730caed5e1f0532ef45c0928b1fd730259e7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/104] 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 4250aca27804600d911a50340ecc7829dfdcf507 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/104] 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 96247fc50c224ae8d7b930c330801eb786ad01d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/104] 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 dae4c49358da093f4b49161013b7321b694c69bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/104] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 52df52c0ba91c5b8c20c651c6f832bc803a77762 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/104] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 bcca84c8dfebc47dae46a14c822553ccc3b0cec6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/104] 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 1cefca5c95d5f907d345cce38b36a078f3cac287 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/104] 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 7f23dd9e5efea41b858f0ffbf2b34a38636ccd92 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/104] 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 0a6f48d0fd21d32f91a830abe1b4a785576b1fbf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/104] 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 d355ba9a71080c68e1ca5781a96faa5666a0c07c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/104] 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 e3d825bc1a1354f44904a1b62388db7f87f4b444 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/104] 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 8f6a15ff450b2085dc1504e360a03395113943c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/104] 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 a0f9f82cb603ec68c423ca5d885cd6278c69da29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/104] 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 9b30af868de3e181f59d882dec440ec7a96c8b62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/104] 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 a9325f619b6af92af3386ba038c1b5eb3cd56581 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/104] 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 c116955eebaf17483eb641785ce3fc7462a50b37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/104] 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 33e12aaa1cc4c4ef5ac8bef595c6bba6593fa0f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/104] 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 24a8754a67eed9ea63308cd7e7d58df9485e8e3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/104] 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 9da028284e2f6859bb926d9a8e374f24d31b5f16 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/104] 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 c21e58f6d9129e3a9ab8ac28827d69c627631030 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/104] 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 69002557f725eaafef2fae3b15fbfd63838fa811 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/104] 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 f3d773af975fcd2f3e4f37b3cc9947228ef18a04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/104] 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 197256f3ef4f879dd810e166b4b9bf576c1d787d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/104] 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 7111ca924638ccc37a57de7f5eb89fb2c572dc21 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/104] 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 166f8e49970b94e6f733a98ea257d2640db64d0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/104] 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 6073336dd3d0677b708324dae79765dd2030b70b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/104] 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 3b4fd9a19cdf087b47ebe5eaa5c492e6c560dcb3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/104] 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 1b13df0f5c576443062f9b5c9d1ec2c3159f3eda Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/104] 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 5fc5e927fb10fc591417ec3f6699402de0211663 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/104] 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 f39d4d4875a095857cda5820e3a0bd626d3c4192 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/104] 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 6274f66aec1168b16099ea9671bd754925f8e7b3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/104] 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 b005a7e4395896ebc2fd8d4deda96fc45ee2e689 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/104] 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 cd19f0389445a873707e37214abb798d1c612865 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/104] 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 b0c227df50cee3f73814b4ee0250e602e0a79f3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/104] 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 d83a414ce017ae89248667ce9869a10387f56de4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/104] 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 8856d1910c029b902adcfbb565b48a40b26716d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/104] 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 b66fda7b4ae8bc4373025108104d308baff559c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/104] 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 7b8d7eb2ee1eb51a36024703005957a7e9e46ffb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/104] 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 e073c849a4201c4c0eb1b85d5dabcfac0cdc1cf1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/104] 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 b643e198b45797f0f72e3e2d8102da239a94096d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/104] 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 448063f4d227d339573de938421c9ad61b59cc9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/104] 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 d8ceb1999da697304b6e6f2781e8e00278276ac3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/104] 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 b7685f9e08f4ae949065ac5bba62b15a1c570d58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/104] 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 50c434d218a2005892538a7afa389380eadab65c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/104] 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 4072f014fe54d9f00b453eb830482efb0fc6bda1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/104] 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 2e1894812697f5530e71bd1d2cbe28ae8d448325 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/104] 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 1708c6c419fcff5e81e2772072bab8193019455f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/104] 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 462b579d0bff2052e02c99f7575310579e33ef46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/104] 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 50b423df7f9e26034359baad8fb9eb0f85e736f3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/104] 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 9932255ec020bf527b4de1e816cce56480bb4199 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/104] 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 ec3b1288be54a410249c2dd6dd359f1581aa2ae2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/104] 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"

From 4c20aae416bb97d4f84d6bf033cccdb0f7c27887 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/104] 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 0b985162dc85bc6122adfb18af7408c6bf1d49be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/104] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 73b2fb9a088bb35a58a7cf281e9dafadb521a99c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/104] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..a85515ec0e2e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc96a61891886c624df502f76ad56a5ec9529fbc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/104] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 86ca8b545c6087c53e4a2e90810953328ad9baf0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/104] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 81df3a02ed655d4bbe3702932c15d586338f7a8c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/104] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From 52cbc6d320b51fa81d1248ad8f01eb7d6f191f3d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 103/104] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 487c89ee4616e4c97b09523c9a7004bf85fe719d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 104/104] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 9d122d54a189..4265e166f549 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (32 preceding siblings ...)
  2021-04-04 15:19 ` Gottox
@ 2021-04-05 10:06 ` Gottox
  2021-04-05 10:17 ` Gottox
                   ` (79 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 10:06 UTC (permalink / raw)
  To: ml

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

Comment:
~Blocked by: #29689~

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (33 preceding siblings ...)
  2021-04-05 10:06 ` Gottox
@ 2021-04-05 10:17 ` Gottox
  2021-04-05 10:52 ` [PR PATCH] [Updated] " Gottox
                   ` (78 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 10:17 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
gobject-introspection-1.68.0_1 build error on armv7hf:
```
[69/99] Generating gir-glib with a custom command
FAILED: gir/GLib-2.0.gir 
/builddir/gobject-introspection-1.68.0/build/tools/g-ir-scanner --output=gir/GLib-2.0.gir --no-libtool --quiet --reparse-validate --add-include-path /builddir/gobject-introspection-1.68.0/build/gir --add-include-path /builddir/gobject-introspection-1.68.0/gir --use-binary-wrapper=/usr/bin/g-ir-scanner-qemuwrapper --use-ldd-wrapper=/usr/bin/g-ir-scanner-lddwrapper --identifier-prefix=G --symbol-prefix=g --symbol-prefix=glib --c-include=glib.h --namespace=GLib --nsversion=2.0 --library=glib-2.0 --library=gobject-2.0 --external-library --pkg=glib-2.0 --cflags-begin -I/usr/armv7l-linux-gnueabihf/usr/include/glib-2.0 -I/usr/armv7l-linux-gnueabihf/usr/lib32/glib-2.0/include -DGLIB_COMPILATION -D__G_I18N_LIB_H__ -DGETTEXT_PACKAGE=Dummy --cflags-end /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/gobject/glib-types.h /usr/armv7l-linux-gnueabihf/usr/lib32/glib-2.0/include/glibconfig.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib-unix.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/galloca.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/garray.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gasyncqueue.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gatomic.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gbacktrace.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gbase64.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gbitlock.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gbookmarkfile.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gbytes.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gcharset.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gchecksum.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gconvert.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gdataset.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gdate.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gdatetime.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gdir.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/genviron.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gerror.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gfileutils.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/ggettext.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/ghash.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/ghmac.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/ghook.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/ghostutils.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gi18n-lib.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gi18n.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/giochannel.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gkeyfile.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/glist.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gmacros.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gmain.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gmappedfile.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gmarkup.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gmem.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gmessages.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gnode.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/goption.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gpattern.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gpoll.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gprimes.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gprintf.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gqsort.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gquark.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gqueue.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/grand.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/grcbox.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/grefcount.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/grefstring.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gregex.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gscanner.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gsequence.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gshell.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gslice.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gslist.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gspawn.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gstdio.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gstrfuncs.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gstring.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gstringchunk.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gstrvbuilder.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gtestutils.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gthread.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gthreadpool.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gtimer.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gtimezone.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gtrashstack.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gtree.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gtypes.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gunicode.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/guri.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gutils.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/guuid.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gvariant.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gvarianttype.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gversion.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gversionmacros.h /usr/armv7l-linux-gnueabihf/usr/include/glib-2.0/glib/gwin32.h ../gir/glib-2.0.c
Traceback (most recent call last):
  File "/builddir/gobject-introspection-1.68.0/build/tools/g-ir-scanner", line 98, in <module>
    from giscanner.scannermain import scanner_main
  File "/builddir/gobject-introspection-1.68.0/build/giscanner/scannermain.py", line 35, in <module>
    from giscanner.ast import Include, Namespace
  File "/builddir/gobject-introspection-1.68.0/build/giscanner/ast.py", line 29, in <module>
    from .sourcescanner import CTYPE_TYPEDEF, CSYMBOL_TYPE_TYPEDEF
  File "/builddir/gobject-introspection-1.68.0/build/giscanner/sourcescanner.py", line 34, in <module>
    from giscanner._giscanner import SourceScanner as CSourceScanner
ImportError: Error loading shared library /builddir/gobject-introspection-1.68.0/build/giscanner/_giscanner.cpython-39-x86_64-linux-gnu.so: Exec format error
[70/99] Linking target girepository/cmph/cmph-bdz-test
[71/99] Linking target girepository/gthash-test
[72/99] Linking target girepository/libgirepository-1.0.so.1.0.0
ninja: build stopped: subcommand failed.
=> ERROR: gobject-introspection-1.68.0_1: do_build: '${make_cmd} -C ${meson_builddir} ${makejobs} ${make_build_args} ${make_build_target}' exited with 1
=> ERROR:   in do_build() at common/build-style/meson.sh:132
```

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (34 preceding siblings ...)
  2021-04-05 10:17 ` Gottox
@ 2021-04-05 10:52 ` Gottox
  2021-04-05 15:10 ` Gottox
                   ` (77 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 10:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [ ] gobject-introspection fails on cross armv7hf

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: 139174 bytes --]

From c4f8f88811c13e0e66ac2e228516f3bee140b852 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 001/104] 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 9269a96adeab33a2950936b2a68b3b4b810f94a9 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 002/104] 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 00cb58e06397f9aafe6438301deef86ce7024629 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 003/104] 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 b9330e3e4b880a6c1b28c902a81c8718bd2fe7d9 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 004/104] 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 a85a1154c3e8b5e91b1f9fff05cb66d545de2e40 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 005/104] 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 05ee0f17ed7e246e4fc179a2e568a8e9012dd30d 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 006/104] 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 614416a9b2df6c180769b76813c9d82269fdd060 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 007/104] 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 de06dad6f8b1e6f84a8e0c064f2b7c0edb8f79d1 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 008/104] 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 34e1a85e291ff3ccada19f4ee4b263a9db96251a 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 009/104] 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 00ac688d473c5302f3da084d8c7a5ea29aa72a67 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 010/104] 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 9aa0a601250b..58c50865251c 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 e79c60b544329f699f025ed58484c081a2077458 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/104] 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 12d70eb53b79102278b4c057e662e85859ebcebf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/104] 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 c156a9ba3a581992b71715cdb0e45e5e81d89175 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/104] 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 419277d3717a4e8e69c83552fb0958181a37c9c2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/104] 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 d74e7d8cf972f8ebdecfaa5a3756dafb5c5bdd93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/104] 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 24bb4eb4a797a34ee1041f3b6b819f95adec8aa2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/104] 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 8c925bcf5e83e24b0f3ddaf18df3a434efb9bd80 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/104] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 862161c2cb41cda5ee2a076f597254675176ae3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/104] 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 89bfc3870eb6582f81bc32f052b34a548b1c4b6c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/104] 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 555ef8fa3776be6cf180d7cd2895560eb16799f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/104] 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 a583985638b1459c806564ee8f1478a028741c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/104] 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 4126667b57c6..97b2c3b05351 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 fd56b3b9fcd8768fa3889f25d286f6ba3714157e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/104] 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 97b2c3b05351..07cef8a8bc3e 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 33dc82fefb1043b6e890d5356bffa920d68d9298 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/104] 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 dc5be5bd5837e4560131dc34fbf46bac14852bc5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/104] 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 3767cab70fd994f2446906feeaebe9db7e65066f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/104] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From efa8da6966c646ee2cecf86bd6a63cf7f56514a7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/104] 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 c5bb7fe9a7ec78fe1839286afd27099691bdcfe3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/104] 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 155e2ac18bb2c7bcd853f25a50ecfd7554194cc6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/104] 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 3200179c7595e70ea779828ebf2f7409ea54f2a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/104] 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 4d08495264ea74bac30389e774a515476b273719 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/104] 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 78d34678fc6f33f0f85385abbc04943f63834aa7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/104] 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 179e70a456c50c25514e36a595268a58fd249b5c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/104] 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 6b79c7d645ca5e3e3cf237f167aa6e3657d0365a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/104] 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 b0497e79d42bdb8d42b5a60bcf37a510dda1b60b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/104] 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 40852ee8df2f82385ad0bc45776502fc1a5ee40d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/104] 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 1ec96055c728a5fee00b163ce035ebaa165d12ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/104] 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 faa983109ce6124919051caed76fa806c81e15fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/104] 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 99aba59864046bff03cda18ec50a11ab6c203b39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/104] 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 408e2a022d1a149bea3eca27bc54aa881c844652 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/104] 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 7fef5d8e9c246cfb03a808145c50fc95584c0f37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/104] 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 7b17e48be0e3736957df6552e06d9f97e59f5dd1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/104] 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 62288753a5159450b9b4bb819954ccfcb1127ac6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/104] 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 4f73150ab448e4752fd3e8ec410dbb4d3259cdf0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/104] 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 b7f3cee1adf4479187723510073008ee908d0ac9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/104] 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 9df0c61892cfa983c3d8d1dcdd55baa96e2fcc9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/104] 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 a493ffbf941bf9f8227b7c2ad1a340f460f6cdeb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/104] 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 a3dad7ca0319eaf110918e8512e204c24bea7b19 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/104] 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 01dbb1d216c682e959833951edfcbae053dbe5c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/104] 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 ddd0375718b02679b77e0c3cd420909e62c3a2c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/104] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 a144d2986f22627f8b529b9c1f384ddc1016e1a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/104] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 19478590fd3bead1705e78c5778fe699fb039b7b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/104] 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 7c0faaad4851b8c970ceef2a475c256a95581812 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/104] 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 7ce8ae9a5cc141e7b4d360f0be05fa2b341b6250 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/104] 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 fe37bf29e758bbbc15e4b7c8958273fd807816da Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/104] 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 778864480d3d244f0e3d2c5307ff0b05dec8ed69 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/104] 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 2457bd55ba544a57183d056c3b14a548101bfa0f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/104] 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 9b5d70a533ed69725e5320b8014d3d4828b97b9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/104] 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 3a0022f1d33133fc5bd2ac181e07deeaa1e0af2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/104] 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 33e9e672696e48d6985c7f58e6390ce3628377ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/104] 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 e3ffc7f71642cb36fa4857bc2aea80f41bdaf1ae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/104] 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 515f9c7906cc754e13a9981a856c73597bf5047b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/104] 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 0f58d93304d420835207b3c6c3d3c4dedeedd293 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/104] 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 ef2fb93cc7ed76f67e8213fe8b856af34e3b4372 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/104] 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 dfaed3fdd0dd8c7d329f84f439418ce5550915cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/104] 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 6bde6aa519b0e05963c6989b32043c2d756585fd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/104] 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 024b66ae1bbf92882cab16bc59f9fab00556210a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/104] 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 32bb79306a68d1a86cb7b561e2a70f42074e7e89 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/104] 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 98a8ebc8fddf04cc0ac6ffe037db4281e56d70bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/104] 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 0441841c0e9df2536a1f1414efca6699a041edcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/104] 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 7d7c45716a535be5b9418c97f121af02992c75d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/104] 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 317e09cfc083bff9c7e29ab7a94b6069d950ff72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/104] 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 ffcb27bcb00d9c163526cb7d322ffa22007747d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/104] 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 50dbd9e6adc695e1f76ba63cfff90fd641061664 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/104] 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 ed4874318a714f24bc7df506a435b07827246bfc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/104] 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 cf537fb9715fbeb4bea06116b310ef5674746730 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/104] 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 2265ebd342760a200acfb1dac5e2615d455c3c6a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/104] 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 696ed85504583708654c55ae1a5fbf3c8132ae1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/104] 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 22f097adde3a5e116f3ded8fde27cc5f3fe5d81b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/104] 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 b6cf54ad3b7938231147ce7d25e16dfcf1bf3ed1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/104] 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 7e2fd4bbef56b3d871a6d415bd02b2334471889e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/104] 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 6f063f73b83934563aa5d3284e99a5b9862f302a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/104] 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 1189471f71e8bc7db524fce9f62c72c2fded948b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/104] 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 184d6bb7db71b5f3405aeabe4d7a7ba835c1b976 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/104] 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 462c8967f55f245e24bef3ac731733df4c1ed931 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/104] 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 c2ac8563a1ed2722bb3abfdcad9c86f4c2e4ab4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/104] 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 f970271e479bae43e988e9a1e90b3d1b5d7f9cc3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/104] 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 cb7efcd9a0c4147e88ead3c940fbe6d6a23aa05f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/104] 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 221c08a001260af62c6ad82082ef83b8c15745c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/104] 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 1a52917cd07c9842d7ece44c96176a7144d17f34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/104] 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 2d3be30e70582575b8933d5982694b2ca126de85 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/104] 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 d9f0bdbba253289ab1183b94415c52361dfcca15 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/104] 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 6f85d5134fe0660439400c59e34b61ffe52c4780 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/104] 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 77c02681365256c8db653b5fb6652bcaa1960978 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/104] 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 e44ca7ed054123cc6261217d9120d6abf51d4303 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/104] 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 f1c762123d410ddbd7e91221750958bef7e3d39f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/104] 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 142d562a01ef91640e9a439210d709c1aca38eed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/104] 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"

From 1dcb5819944e3be5e0d1517a61b81f54e01dc2e1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/104] 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 07700c5a842904f0b67104547b86d5623bca21df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/104] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 92429c89dfbabf7830d1fe1b8970ff80d3042d70 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/104] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc8023b2154fe8a2ec04417a8c45ccf85bfd9ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/104] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 11697466cab3857440c4e158519c48de7cf88a65 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/104] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 059bcf34eb862a0416b284448cc2d406766b9026 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/104] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From ebde1abb821d0cebe4d4fbe018d3c42a0d93c2d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 103/104] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 3bdf77d9ee01749d75b65bf990fd83e4194588ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 104/104] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (35 preceding siblings ...)
  2021-04-05 10:52 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-05 15:10 ` Gottox
  2021-04-05 15:20 ` Gottox
                   ` (76 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 15:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [ ] gobject-introspection fails on cross armv7hf

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: 140233 bytes --]

From c4f8f88811c13e0e66ac2e228516f3bee140b852 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 001/105] 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 9269a96adeab33a2950936b2a68b3b4b810f94a9 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 002/105] 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 00cb58e06397f9aafe6438301deef86ce7024629 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 003/105] 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 b9330e3e4b880a6c1b28c902a81c8718bd2fe7d9 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 004/105] 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 a85a1154c3e8b5e91b1f9fff05cb66d545de2e40 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 005/105] 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 05ee0f17ed7e246e4fc179a2e568a8e9012dd30d 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 006/105] 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 614416a9b2df6c180769b76813c9d82269fdd060 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 007/105] 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 de06dad6f8b1e6f84a8e0c064f2b7c0edb8f79d1 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 008/105] 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 34e1a85e291ff3ccada19f4ee4b263a9db96251a 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 009/105] 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 00ac688d473c5302f3da084d8c7a5ea29aa72a67 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 010/105] 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 9aa0a601250b..58c50865251c 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 e79c60b544329f699f025ed58484c081a2077458 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/105] 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 12d70eb53b79102278b4c057e662e85859ebcebf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/105] 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 c156a9ba3a581992b71715cdb0e45e5e81d89175 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/105] 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 419277d3717a4e8e69c83552fb0958181a37c9c2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/105] 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 d74e7d8cf972f8ebdecfaa5a3756dafb5c5bdd93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/105] 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 24bb4eb4a797a34ee1041f3b6b819f95adec8aa2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/105] 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 8c925bcf5e83e24b0f3ddaf18df3a434efb9bd80 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/105] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 862161c2cb41cda5ee2a076f597254675176ae3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/105] 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 89bfc3870eb6582f81bc32f052b34a548b1c4b6c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/105] 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 555ef8fa3776be6cf180d7cd2895560eb16799f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/105] 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 a583985638b1459c806564ee8f1478a028741c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/105] 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 4126667b57c6..97b2c3b05351 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 fd56b3b9fcd8768fa3889f25d286f6ba3714157e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/105] 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 97b2c3b05351..07cef8a8bc3e 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 33dc82fefb1043b6e890d5356bffa920d68d9298 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/105] 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 dc5be5bd5837e4560131dc34fbf46bac14852bc5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/105] 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 3767cab70fd994f2446906feeaebe9db7e65066f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/105] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From efa8da6966c646ee2cecf86bd6a63cf7f56514a7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/105] 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 c5bb7fe9a7ec78fe1839286afd27099691bdcfe3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/105] 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 155e2ac18bb2c7bcd853f25a50ecfd7554194cc6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/105] 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 3200179c7595e70ea779828ebf2f7409ea54f2a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/105] 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 4d08495264ea74bac30389e774a515476b273719 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/105] 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 78d34678fc6f33f0f85385abbc04943f63834aa7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/105] 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 179e70a456c50c25514e36a595268a58fd249b5c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/105] 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 6b79c7d645ca5e3e3cf237f167aa6e3657d0365a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/105] 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 b0497e79d42bdb8d42b5a60bcf37a510dda1b60b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/105] 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 40852ee8df2f82385ad0bc45776502fc1a5ee40d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/105] 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 1ec96055c728a5fee00b163ce035ebaa165d12ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/105] 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 faa983109ce6124919051caed76fa806c81e15fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/105] 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 99aba59864046bff03cda18ec50a11ab6c203b39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/105] 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 408e2a022d1a149bea3eca27bc54aa881c844652 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/105] 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 7fef5d8e9c246cfb03a808145c50fc95584c0f37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/105] 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 7b17e48be0e3736957df6552e06d9f97e59f5dd1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/105] 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 62288753a5159450b9b4bb819954ccfcb1127ac6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/105] 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 4f73150ab448e4752fd3e8ec410dbb4d3259cdf0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/105] 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 b7f3cee1adf4479187723510073008ee908d0ac9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/105] 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 9df0c61892cfa983c3d8d1dcdd55baa96e2fcc9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/105] 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 a493ffbf941bf9f8227b7c2ad1a340f460f6cdeb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/105] 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 a3dad7ca0319eaf110918e8512e204c24bea7b19 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/105] 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 01dbb1d216c682e959833951edfcbae053dbe5c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/105] 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 ddd0375718b02679b77e0c3cd420909e62c3a2c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/105] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 a144d2986f22627f8b529b9c1f384ddc1016e1a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/105] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 19478590fd3bead1705e78c5778fe699fb039b7b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/105] 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 7c0faaad4851b8c970ceef2a475c256a95581812 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/105] 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 7ce8ae9a5cc141e7b4d360f0be05fa2b341b6250 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/105] 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 fe37bf29e758bbbc15e4b7c8958273fd807816da Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/105] 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 778864480d3d244f0e3d2c5307ff0b05dec8ed69 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/105] 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 2457bd55ba544a57183d056c3b14a548101bfa0f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/105] 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 9b5d70a533ed69725e5320b8014d3d4828b97b9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/105] 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 3a0022f1d33133fc5bd2ac181e07deeaa1e0af2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/105] 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 33e9e672696e48d6985c7f58e6390ce3628377ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/105] 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 e3ffc7f71642cb36fa4857bc2aea80f41bdaf1ae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/105] 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 515f9c7906cc754e13a9981a856c73597bf5047b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/105] 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 0f58d93304d420835207b3c6c3d3c4dedeedd293 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/105] 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 ef2fb93cc7ed76f67e8213fe8b856af34e3b4372 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/105] 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 dfaed3fdd0dd8c7d329f84f439418ce5550915cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/105] 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 6bde6aa519b0e05963c6989b32043c2d756585fd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/105] 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 024b66ae1bbf92882cab16bc59f9fab00556210a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/105] 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 32bb79306a68d1a86cb7b561e2a70f42074e7e89 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/105] 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 98a8ebc8fddf04cc0ac6ffe037db4281e56d70bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/105] 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 0441841c0e9df2536a1f1414efca6699a041edcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/105] 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 7d7c45716a535be5b9418c97f121af02992c75d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/105] 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 317e09cfc083bff9c7e29ab7a94b6069d950ff72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/105] 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 ffcb27bcb00d9c163526cb7d322ffa22007747d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/105] 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 50dbd9e6adc695e1f76ba63cfff90fd641061664 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/105] 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 ed4874318a714f24bc7df506a435b07827246bfc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/105] 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 cf537fb9715fbeb4bea06116b310ef5674746730 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/105] 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 2265ebd342760a200acfb1dac5e2615d455c3c6a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/105] 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 696ed85504583708654c55ae1a5fbf3c8132ae1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/105] 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 22f097adde3a5e116f3ded8fde27cc5f3fe5d81b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/105] 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 b6cf54ad3b7938231147ce7d25e16dfcf1bf3ed1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/105] 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 7e2fd4bbef56b3d871a6d415bd02b2334471889e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/105] 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 6f063f73b83934563aa5d3284e99a5b9862f302a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/105] 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 1189471f71e8bc7db524fce9f62c72c2fded948b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/105] 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 184d6bb7db71b5f3405aeabe4d7a7ba835c1b976 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/105] 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 462c8967f55f245e24bef3ac731733df4c1ed931 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/105] 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 c2ac8563a1ed2722bb3abfdcad9c86f4c2e4ab4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/105] 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 f970271e479bae43e988e9a1e90b3d1b5d7f9cc3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/105] 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 cb7efcd9a0c4147e88ead3c940fbe6d6a23aa05f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/105] 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 221c08a001260af62c6ad82082ef83b8c15745c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/105] 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 1a52917cd07c9842d7ece44c96176a7144d17f34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/105] 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 2d3be30e70582575b8933d5982694b2ca126de85 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/105] 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 d9f0bdbba253289ab1183b94415c52361dfcca15 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/105] 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 6f85d5134fe0660439400c59e34b61ffe52c4780 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/105] 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 77c02681365256c8db653b5fb6652bcaa1960978 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/105] 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 e44ca7ed054123cc6261217d9120d6abf51d4303 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/105] 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 f1c762123d410ddbd7e91221750958bef7e3d39f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/105] 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 142d562a01ef91640e9a439210d709c1aca38eed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/105] 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"

From 1dcb5819944e3be5e0d1517a61b81f54e01dc2e1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/105] 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 07700c5a842904f0b67104547b86d5623bca21df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/105] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 92429c89dfbabf7830d1fe1b8970ff80d3042d70 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/105] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc8023b2154fe8a2ec04417a8c45ccf85bfd9ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/105] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 11697466cab3857440c4e158519c48de7cf88a65 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/105] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 059bcf34eb862a0416b284448cc2d406766b9026 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/105] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From ebde1abb821d0cebe4d4fbe018d3c42a0d93c2d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 103/105] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 3bdf77d9ee01749d75b65bf990fd83e4194588ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 104/105] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 39af1595ea4ac2be4dc1bd76f531a089eb0b27c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 105/105] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (36 preceding siblings ...)
  2021-04-05 15:10 ` Gottox
@ 2021-04-05 15:20 ` Gottox
  2021-04-05 17:21 ` [PR PATCH] [Updated] " Gottox
                   ` (75 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 15:20 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
~duplicate of #29959.~

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (37 preceding siblings ...)
  2021-04-05 15:20 ` Gottox
@ 2021-04-05 17:21 ` Gottox
  2021-04-05 17:24 ` Gottox
                   ` (74 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 17:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 142072 bytes --]

From c4f8f88811c13e0e66ac2e228516f3bee140b852 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 001/106] 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 9269a96adeab33a2950936b2a68b3b4b810f94a9 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 002/106] 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 00cb58e06397f9aafe6438301deef86ce7024629 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 003/106] 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 b9330e3e4b880a6c1b28c902a81c8718bd2fe7d9 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 004/106] 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 a85a1154c3e8b5e91b1f9fff05cb66d545de2e40 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 005/106] 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 05ee0f17ed7e246e4fc179a2e568a8e9012dd30d 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 006/106] 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 614416a9b2df6c180769b76813c9d82269fdd060 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 007/106] 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 de06dad6f8b1e6f84a8e0c064f2b7c0edb8f79d1 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 008/106] 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 34e1a85e291ff3ccada19f4ee4b263a9db96251a 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 009/106] 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 00ac688d473c5302f3da084d8c7a5ea29aa72a67 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 010/106] 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 9aa0a601250b..58c50865251c 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 e79c60b544329f699f025ed58484c081a2077458 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/106] 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 12d70eb53b79102278b4c057e662e85859ebcebf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/106] 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 c156a9ba3a581992b71715cdb0e45e5e81d89175 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/106] 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 419277d3717a4e8e69c83552fb0958181a37c9c2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/106] 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 d74e7d8cf972f8ebdecfaa5a3756dafb5c5bdd93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/106] 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 24bb4eb4a797a34ee1041f3b6b819f95adec8aa2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/106] 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 8c925bcf5e83e24b0f3ddaf18df3a434efb9bd80 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/106] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 862161c2cb41cda5ee2a076f597254675176ae3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/106] 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 89bfc3870eb6582f81bc32f052b34a548b1c4b6c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/106] 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 555ef8fa3776be6cf180d7cd2895560eb16799f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/106] 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 a583985638b1459c806564ee8f1478a028741c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/106] 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 4126667b57c6..97b2c3b05351 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 fd56b3b9fcd8768fa3889f25d286f6ba3714157e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/106] 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 97b2c3b05351..07cef8a8bc3e 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 33dc82fefb1043b6e890d5356bffa920d68d9298 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/106] 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 dc5be5bd5837e4560131dc34fbf46bac14852bc5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/106] 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 3767cab70fd994f2446906feeaebe9db7e65066f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/106] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From efa8da6966c646ee2cecf86bd6a63cf7f56514a7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/106] 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 c5bb7fe9a7ec78fe1839286afd27099691bdcfe3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/106] 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 155e2ac18bb2c7bcd853f25a50ecfd7554194cc6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/106] 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 3200179c7595e70ea779828ebf2f7409ea54f2a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/106] 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 4d08495264ea74bac30389e774a515476b273719 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/106] 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 78d34678fc6f33f0f85385abbc04943f63834aa7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/106] 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 179e70a456c50c25514e36a595268a58fd249b5c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/106] 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 6b79c7d645ca5e3e3cf237f167aa6e3657d0365a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/106] 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 b0497e79d42bdb8d42b5a60bcf37a510dda1b60b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/106] 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 40852ee8df2f82385ad0bc45776502fc1a5ee40d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/106] 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 1ec96055c728a5fee00b163ce035ebaa165d12ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/106] 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 faa983109ce6124919051caed76fa806c81e15fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/106] 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 99aba59864046bff03cda18ec50a11ab6c203b39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/106] 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 408e2a022d1a149bea3eca27bc54aa881c844652 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/106] 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 7fef5d8e9c246cfb03a808145c50fc95584c0f37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/106] 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 7b17e48be0e3736957df6552e06d9f97e59f5dd1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/106] 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 62288753a5159450b9b4bb819954ccfcb1127ac6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/106] 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 4f73150ab448e4752fd3e8ec410dbb4d3259cdf0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/106] 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 b7f3cee1adf4479187723510073008ee908d0ac9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/106] 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 9df0c61892cfa983c3d8d1dcdd55baa96e2fcc9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/106] 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 a493ffbf941bf9f8227b7c2ad1a340f460f6cdeb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/106] 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 a3dad7ca0319eaf110918e8512e204c24bea7b19 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/106] 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 01dbb1d216c682e959833951edfcbae053dbe5c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/106] 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 ddd0375718b02679b77e0c3cd420909e62c3a2c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/106] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 a144d2986f22627f8b529b9c1f384ddc1016e1a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/106] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 19478590fd3bead1705e78c5778fe699fb039b7b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/106] 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 7c0faaad4851b8c970ceef2a475c256a95581812 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/106] 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 7ce8ae9a5cc141e7b4d360f0be05fa2b341b6250 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/106] 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 fe37bf29e758bbbc15e4b7c8958273fd807816da Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/106] 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 778864480d3d244f0e3d2c5307ff0b05dec8ed69 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/106] 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 2457bd55ba544a57183d056c3b14a548101bfa0f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/106] 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 9b5d70a533ed69725e5320b8014d3d4828b97b9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/106] 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 3a0022f1d33133fc5bd2ac181e07deeaa1e0af2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/106] 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 33e9e672696e48d6985c7f58e6390ce3628377ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/106] 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 e3ffc7f71642cb36fa4857bc2aea80f41bdaf1ae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/106] 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 515f9c7906cc754e13a9981a856c73597bf5047b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/106] 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 0f58d93304d420835207b3c6c3d3c4dedeedd293 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/106] 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 ef2fb93cc7ed76f67e8213fe8b856af34e3b4372 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/106] 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 dfaed3fdd0dd8c7d329f84f439418ce5550915cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/106] 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 6bde6aa519b0e05963c6989b32043c2d756585fd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/106] 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 024b66ae1bbf92882cab16bc59f9fab00556210a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/106] 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 32bb79306a68d1a86cb7b561e2a70f42074e7e89 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/106] 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 98a8ebc8fddf04cc0ac6ffe037db4281e56d70bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/106] 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 0441841c0e9df2536a1f1414efca6699a041edcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/106] 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 7d7c45716a535be5b9418c97f121af02992c75d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/106] 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 317e09cfc083bff9c7e29ab7a94b6069d950ff72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/106] 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 ffcb27bcb00d9c163526cb7d322ffa22007747d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/106] 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 50dbd9e6adc695e1f76ba63cfff90fd641061664 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/106] 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 ed4874318a714f24bc7df506a435b07827246bfc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/106] 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 cf537fb9715fbeb4bea06116b310ef5674746730 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/106] 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 2265ebd342760a200acfb1dac5e2615d455c3c6a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/106] 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 696ed85504583708654c55ae1a5fbf3c8132ae1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/106] 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 22f097adde3a5e116f3ded8fde27cc5f3fe5d81b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/106] 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 b6cf54ad3b7938231147ce7d25e16dfcf1bf3ed1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/106] 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 7e2fd4bbef56b3d871a6d415bd02b2334471889e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/106] 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 6f063f73b83934563aa5d3284e99a5b9862f302a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/106] 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 1189471f71e8bc7db524fce9f62c72c2fded948b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/106] 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 184d6bb7db71b5f3405aeabe4d7a7ba835c1b976 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/106] 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 462c8967f55f245e24bef3ac731733df4c1ed931 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/106] 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 c2ac8563a1ed2722bb3abfdcad9c86f4c2e4ab4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/106] 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 f970271e479bae43e988e9a1e90b3d1b5d7f9cc3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/106] 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 cb7efcd9a0c4147e88ead3c940fbe6d6a23aa05f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/106] 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 221c08a001260af62c6ad82082ef83b8c15745c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/106] 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 1a52917cd07c9842d7ece44c96176a7144d17f34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/106] 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 2d3be30e70582575b8933d5982694b2ca126de85 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/106] 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 d9f0bdbba253289ab1183b94415c52361dfcca15 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/106] 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 6f85d5134fe0660439400c59e34b61ffe52c4780 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/106] 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 77c02681365256c8db653b5fb6652bcaa1960978 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/106] 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 e44ca7ed054123cc6261217d9120d6abf51d4303 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/106] 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 f1c762123d410ddbd7e91221750958bef7e3d39f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/106] 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 142d562a01ef91640e9a439210d709c1aca38eed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/106] 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"

From 1dcb5819944e3be5e0d1517a61b81f54e01dc2e1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/106] 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 07700c5a842904f0b67104547b86d5623bca21df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/106] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 92429c89dfbabf7830d1fe1b8970ff80d3042d70 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/106] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc8023b2154fe8a2ec04417a8c45ccf85bfd9ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/106] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 11697466cab3857440c4e158519c48de7cf88a65 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/106] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 059bcf34eb862a0416b284448cc2d406766b9026 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/106] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From ebde1abb821d0cebe4d4fbe018d3c42a0d93c2d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 103/106] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 3bdf77d9ee01749d75b65bf990fd83e4194588ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 104/106] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 39af1595ea4ac2be4dc1bd76f531a089eb0b27c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 105/106] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From b8a4e9636b0d4161b2834ebc98a46005b32e22fc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 106/106] libvirt-glib: make gtk doc a buildoption to fix
 cross. Default is off

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

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..264ad0c20802 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="gir vala doc"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (38 preceding siblings ...)
  2021-04-05 17:21 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-05 17:24 ` Gottox
  2021-04-05 22:11 ` Gottox
                   ` (73 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 17:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [ ] armv6l-musl
* [ ] armv6l
* [ ] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 143170 bytes --]

From c4f8f88811c13e0e66ac2e228516f3bee140b852 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 001/106] 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 9269a96adeab33a2950936b2a68b3b4b810f94a9 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 002/106] 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 00cb58e06397f9aafe6438301deef86ce7024629 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 003/106] 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 b9330e3e4b880a6c1b28c902a81c8718bd2fe7d9 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 004/106] 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 a85a1154c3e8b5e91b1f9fff05cb66d545de2e40 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 005/106] 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 05ee0f17ed7e246e4fc179a2e568a8e9012dd30d 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 006/106] 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 614416a9b2df6c180769b76813c9d82269fdd060 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 007/106] 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 de06dad6f8b1e6f84a8e0c064f2b7c0edb8f79d1 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 008/106] 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 34e1a85e291ff3ccada19f4ee4b263a9db96251a 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 009/106] 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 00ac688d473c5302f3da084d8c7a5ea29aa72a67 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 010/106] 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 9aa0a601250b..58c50865251c 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 e79c60b544329f699f025ed58484c081a2077458 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/106] 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 12d70eb53b79102278b4c057e662e85859ebcebf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/106] 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 c156a9ba3a581992b71715cdb0e45e5e81d89175 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/106] 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 419277d3717a4e8e69c83552fb0958181a37c9c2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/106] 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 d74e7d8cf972f8ebdecfaa5a3756dafb5c5bdd93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/106] 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 24bb4eb4a797a34ee1041f3b6b819f95adec8aa2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/106] 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 8c925bcf5e83e24b0f3ddaf18df3a434efb9bd80 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/106] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 862161c2cb41cda5ee2a076f597254675176ae3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/106] 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 89bfc3870eb6582f81bc32f052b34a548b1c4b6c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/106] 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 555ef8fa3776be6cf180d7cd2895560eb16799f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/106] 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 a583985638b1459c806564ee8f1478a028741c47 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/106] 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 4126667b57c6..97b2c3b05351 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 fd56b3b9fcd8768fa3889f25d286f6ba3714157e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/106] 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 97b2c3b05351..07cef8a8bc3e 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 33dc82fefb1043b6e890d5356bffa920d68d9298 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/106] 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 dc5be5bd5837e4560131dc34fbf46bac14852bc5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/106] 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 3767cab70fd994f2446906feeaebe9db7e65066f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/106] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From efa8da6966c646ee2cecf86bd6a63cf7f56514a7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/106] 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 c5bb7fe9a7ec78fe1839286afd27099691bdcfe3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/106] 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 155e2ac18bb2c7bcd853f25a50ecfd7554194cc6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/106] 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 3200179c7595e70ea779828ebf2f7409ea54f2a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/106] 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 4d08495264ea74bac30389e774a515476b273719 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/106] 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 78d34678fc6f33f0f85385abbc04943f63834aa7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/106] 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 179e70a456c50c25514e36a595268a58fd249b5c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/106] 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 6b79c7d645ca5e3e3cf237f167aa6e3657d0365a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/106] 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 b0497e79d42bdb8d42b5a60bcf37a510dda1b60b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/106] 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 40852ee8df2f82385ad0bc45776502fc1a5ee40d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/106] 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 1ec96055c728a5fee00b163ce035ebaa165d12ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/106] 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 faa983109ce6124919051caed76fa806c81e15fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/106] 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 99aba59864046bff03cda18ec50a11ab6c203b39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/106] 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 408e2a022d1a149bea3eca27bc54aa881c844652 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/106] 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 7fef5d8e9c246cfb03a808145c50fc95584c0f37 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/106] 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 7b17e48be0e3736957df6552e06d9f97e59f5dd1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/106] 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 62288753a5159450b9b4bb819954ccfcb1127ac6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/106] 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 4f73150ab448e4752fd3e8ec410dbb4d3259cdf0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/106] 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 b7f3cee1adf4479187723510073008ee908d0ac9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/106] 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 9df0c61892cfa983c3d8d1dcdd55baa96e2fcc9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/106] 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 a493ffbf941bf9f8227b7c2ad1a340f460f6cdeb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/106] 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 a3dad7ca0319eaf110918e8512e204c24bea7b19 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/106] 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 01dbb1d216c682e959833951edfcbae053dbe5c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/106] 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 ddd0375718b02679b77e0c3cd420909e62c3a2c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/106] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 a144d2986f22627f8b529b9c1f384ddc1016e1a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/106] 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 fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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 19478590fd3bead1705e78c5778fe699fb039b7b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/106] 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 7c0faaad4851b8c970ceef2a475c256a95581812 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/106] 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 7ce8ae9a5cc141e7b4d360f0be05fa2b341b6250 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/106] 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 fe37bf29e758bbbc15e4b7c8958273fd807816da Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/106] 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 778864480d3d244f0e3d2c5307ff0b05dec8ed69 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/106] 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 2457bd55ba544a57183d056c3b14a548101bfa0f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/106] 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 9b5d70a533ed69725e5320b8014d3d4828b97b9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/106] 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 3a0022f1d33133fc5bd2ac181e07deeaa1e0af2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/106] 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 33e9e672696e48d6985c7f58e6390ce3628377ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/106] 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 e3ffc7f71642cb36fa4857bc2aea80f41bdaf1ae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/106] 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 515f9c7906cc754e13a9981a856c73597bf5047b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/106] 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 0f58d93304d420835207b3c6c3d3c4dedeedd293 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/106] 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 ef2fb93cc7ed76f67e8213fe8b856af34e3b4372 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/106] 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 dfaed3fdd0dd8c7d329f84f439418ce5550915cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/106] 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 6bde6aa519b0e05963c6989b32043c2d756585fd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/106] 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 024b66ae1bbf92882cab16bc59f9fab00556210a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/106] 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 32bb79306a68d1a86cb7b561e2a70f42074e7e89 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/106] 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 98a8ebc8fddf04cc0ac6ffe037db4281e56d70bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/106] 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 0441841c0e9df2536a1f1414efca6699a041edcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/106] 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 7d7c45716a535be5b9418c97f121af02992c75d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/106] 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 317e09cfc083bff9c7e29ab7a94b6069d950ff72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/106] 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 ffcb27bcb00d9c163526cb7d322ffa22007747d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/106] 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 50dbd9e6adc695e1f76ba63cfff90fd641061664 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/106] 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 ed4874318a714f24bc7df506a435b07827246bfc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/106] 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 cf537fb9715fbeb4bea06116b310ef5674746730 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/106] 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 2265ebd342760a200acfb1dac5e2615d455c3c6a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/106] 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 696ed85504583708654c55ae1a5fbf3c8132ae1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/106] 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 22f097adde3a5e116f3ded8fde27cc5f3fe5d81b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/106] 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 b6cf54ad3b7938231147ce7d25e16dfcf1bf3ed1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/106] 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 7e2fd4bbef56b3d871a6d415bd02b2334471889e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/106] 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 6f063f73b83934563aa5d3284e99a5b9862f302a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/106] 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 1189471f71e8bc7db524fce9f62c72c2fded948b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/106] 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 184d6bb7db71b5f3405aeabe4d7a7ba835c1b976 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/106] 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 462c8967f55f245e24bef3ac731733df4c1ed931 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/106] 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 c2ac8563a1ed2722bb3abfdcad9c86f4c2e4ab4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/106] 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 f970271e479bae43e988e9a1e90b3d1b5d7f9cc3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/106] 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 cb7efcd9a0c4147e88ead3c940fbe6d6a23aa05f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/106] 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 221c08a001260af62c6ad82082ef83b8c15745c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/106] 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 1a52917cd07c9842d7ece44c96176a7144d17f34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/106] 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 2d3be30e70582575b8933d5982694b2ca126de85 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/106] 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 d9f0bdbba253289ab1183b94415c52361dfcca15 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/106] 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 6f85d5134fe0660439400c59e34b61ffe52c4780 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/106] 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 77c02681365256c8db653b5fb6652bcaa1960978 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/106] 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 e44ca7ed054123cc6261217d9120d6abf51d4303 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/106] 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 f1c762123d410ddbd7e91221750958bef7e3d39f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/106] 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 142d562a01ef91640e9a439210d709c1aca38eed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/106] 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"

From 1dcb5819944e3be5e0d1517a61b81f54e01dc2e1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/106] 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 07700c5a842904f0b67104547b86d5623bca21df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/106] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 92429c89dfbabf7830d1fe1b8970ff80d3042d70 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/106] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From cc8023b2154fe8a2ec04417a8c45ccf85bfd9ef3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/106] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 11697466cab3857440c4e158519c48de7cf88a65 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/106] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 059bcf34eb862a0416b284448cc2d406766b9026 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/106] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From ebde1abb821d0cebe4d4fbe018d3c42a0d93c2d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 103/106] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 3bdf77d9ee01749d75b65bf990fd83e4194588ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 104/106] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 39af1595ea4ac2be4dc1bd76f531a089eb0b27c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 105/106] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From 6a9d30068907eccc4b7df3105b4402221e3ced04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 106/106] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..264ad0c20802 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="gir vala doc"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (39 preceding siblings ...)
  2021-04-05 17:24 ` Gottox
@ 2021-04-05 22:11 ` Gottox
  2021-04-05 22:14 ` Gottox
                   ` (72 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 22:11 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
# :smile: 
![Screenshot from 2021-04-05 21-56-31](https://user-images.githubusercontent.com/1056976/113633026-7f38df00-966c-11eb-9762-5e5554a1718f.png)
# :disappointed: 
![Screenshot from 2021-04-05 23-57-59](https://user-images.githubusercontent.com/1056976/113633049-8cee6480-966c-11eb-8356-cee1200718f5.png)


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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (40 preceding siblings ...)
  2021-04-05 22:11 ` Gottox
@ 2021-04-05 22:14 ` Gottox
  2021-04-05 23:50 ` ericonr
                   ` (71 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-05 22:14 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
<h1 align="center">
:smile: 
</h1>

![Screenshot from 2021-04-05 21-56-31](https://user-images.githubusercontent.com/1056976/113633026-7f38df00-966c-11eb-9762-5e5554a1718f.png)
<h1 align="center">
:disappointed: 
</h1>

![Screenshot from 2021-04-05 23-57-59](https://user-images.githubusercontent.com/1056976/113633049-8cee6480-966c-11eb-8356-cee1200718f5.png)


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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (41 preceding siblings ...)
  2021-04-05 22:14 ` Gottox
@ 2021-04-05 23:50 ` ericonr
  2021-04-05 23:56 ` ericonr
                   ` (70 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: ericonr @ 2021-04-05 23:50 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

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

Comment:
Have you tried on real hardware? I can give it a test drive.

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (42 preceding siblings ...)
  2021-04-05 23:50 ` ericonr
@ 2021-04-05 23:56 ` ericonr
  2021-04-05 23:57 ` ericonr
                   ` (69 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: ericonr @ 2021-04-05 23:56 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

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

Comment:
Btw, please include https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2010 as a backport.

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (43 preceding siblings ...)
  2021-04-05 23:56 ` ericonr
@ 2021-04-05 23:57 ` ericonr
  2021-04-05 23:58 ` ericonr
                   ` (68 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: ericonr @ 2021-04-05 23:57 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

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

Comment:
Btw, please include https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2010 as a backport.

And I would bump `common/shlibs` for all the GNOME packages as well.

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (44 preceding siblings ...)
  2021-04-05 23:57 ` ericonr
@ 2021-04-05 23:58 ` ericonr
  2021-04-06  7:13 ` Gottox
                   ` (67 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: ericonr @ 2021-04-05 23:58 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

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

Comment:
Btw, please include https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2010 as a backport.

And I would bump `common/shlibs` for all the GNOME packages as well (there's a high chance they will be using newly available functions from other GNOME pieces).

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (45 preceding siblings ...)
  2021-04-05 23:58 ` ericonr
@ 2021-04-06  7:13 ` Gottox
  2021-04-06  7:33 ` Gottox
                   ` (66 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06  7:13 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
> Have you tried on real hardware? I can give it a test drive.

Not yet. I at least want to have _some_ stability on qemu. Atm it's pretty much unusable on it.

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (46 preceding siblings ...)
  2021-04-06  7:13 ` Gottox
@ 2021-04-06  7:33 ` Gottox
  2021-04-06  7:42 ` Gottox
                   ` (65 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06  7:33 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
> Btw, please include https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2010 as a backport.
applied
> And I would bump `common/shlibs` for all the GNOME packages as well (there's a high chance they will be using newly available functions from other GNOME pieces).
Good idea

The glib fix has no effect on the stability issues in qemu.

But I see a second issue in dmesg:
```
[  128.022735] gsd-usb-protect[1585]: segfault at 8 ip 000055b7a42fd118 sp 00007fffa0c72190 error 4 in gsd-usb-protection[55b7a42fb000+3000]
```

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (47 preceding siblings ...)
  2021-04-06  7:33 ` Gottox
@ 2021-04-06  7:42 ` Gottox
  2021-04-06  7:44 ` Gottox
                   ` (64 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06  7:42 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/issues/585

That looks like my exact issue.

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (48 preceding siblings ...)
  2021-04-06  7:42 ` Gottox
@ 2021-04-06  7:44 ` Gottox
  2021-04-06  8:06 ` Gottox
                   ` (63 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06  7:44 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/issues/585

That looks like my exact issue.

The issue is tracked for fedora here: https://bugzilla.redhat.com/show_bug.cgi?id=1937073

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (49 preceding siblings ...)
  2021-04-06  7:44 ` Gottox
@ 2021-04-06  8:06 ` Gottox
  2021-04-06 10:59 ` [PR PATCH] [Updated] " Gottox
                   ` (62 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06  8:06 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
Okay, what I found out so far:

* this issue seems to happen only on VMs so far (at least the issues mention that)
* there's a relation between the session crash and the crash of the gsd service.

The actual session log looks like this:

```
** (gsd-usb-protection:2366): WARNING **: 08:00:25.614: Failed to connect to the screen saver: Error calling StartServiceByName for org.gnome.ScreenSaver: Timeout was reached

(gsd-usb-protection:2366): GLib-GIO-CRITICAL **: 08:00:25.614: g_dbus_proxy_call_sync_internal: assertion 'G_IS_DBUS_PROXY (proxy)' failed
gnome-session-binary[1914]: WARNING: App 'org.gnome.SettingsDaemon.UsbProtection.desktop' respawning too quickly
gnome-session-binary[1914]: WARNING: Application 'org.gnome.SettingsDaemon.UsbProtection.desktop' killed by signal 11

(process:2476): Gtk-WARNING **: 08:00:25.669: Locale not supported by C library.
	Using the fallback 'C' locale.
Window manager warning: Failed to create DRM buffer wrapper: drmModeAddFB does not support format 'AR24' (0x34325241)
Window manager warning: Failed to create DRM buffer wrapper: drmModeAddFB does not support format 'AR24' (0x34325241)

(gnome-shell:1976): mutter-CRITICAL **: 08:00:26.173: meta_window_set_stack_position_no_sync: assertion 'window->stack_position >= 0' failed
```

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (50 preceding siblings ...)
  2021-04-06  8:06 ` Gottox
@ 2021-04-06 10:59 ` Gottox
  2021-04-06 11:18 ` Gottox
                   ` (61 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06 10:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 166858 bytes --]

From 0ecd61ed03659f4c198673c62b6e7670086eceed 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 001/108] 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 1dfd164cc3b7e9cad661ebe10a5f1b80de1bb9e1 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 002/108] 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 449ebe0f384dc111111a619755a947218e61d3fc 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 003/108] 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 74445dd7b2decce74ccfe8e4bab535ec8c1a43af 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 004/108] 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 90e073aa2a9eb9bae329f04e08c348c8f0a9c1ec 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 005/108] 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 dd991487f3f124368dddcf23ed51cec6338420ad 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 006/108] 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 5670d7590051cdf55c7093aff3b88b257ad6ce73 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 007/108] 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 035d54cc01eef0fc326ca0b0b0f2c32ee636d870 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 008/108] 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 81f3f0a4a1b0c341bf77055b4d99eab0ee064f55 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 009/108] 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 c80fa7a5c12c03de93186e9b3ce8eef9ea768ffc 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 010/108] 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 9aa0a601250b..58c50865251c 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 08c97a8ed0d3e3087752a663b80312739d5fcd0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/108] 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 c694c50082d66a8b253caa8216eed948247c5b2d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/108] 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 8f17376c768dee9c9c3b8326378a29fa05ac5039 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/108] 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 fd9146a8ccd8f33c6e4acd106cf7a8802ea6a770 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/108] 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 53915552616350de1b8c9ac2cb448bea84d0fbe8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/108] 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 9ca6a25d623fc8d34ab4399417340a71e32a20c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/108] 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 8ee69a1e2f3bfc0d24db172f65bfa3ee1550338c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/108] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 14709167d92a89bcf14fdc2dcad2e274f100659f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/108] 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 cb64131e7c741e9c5587b3b7a7d75bfebf8fc84f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/108] 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 73eba3f1ab042eb75dfbd0816fdfc85fc0f8ad8d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/108] 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 4660c61dbd7a1d6372e4ca5d64254848f1beff0a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/108] 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 4126667b57c6..97b2c3b05351 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 97bfb1b534ae6297a05751f9624195bd3948ce69 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/108] 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 97b2c3b05351..07cef8a8bc3e 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 20b5d1fac070590208207cbe989f9d696b8bedfc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/108] 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 31c4a2c1cacf9005d3e81bfe2d81eb0adecc0ae9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/108] 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 a1b48c8a64113be1df2edc00be851aa87cce78b6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/108] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From b709d47c5849c46797960f68d2cec24225960bb3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/108] 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 fcd00252c30874ec026c03b9cc33c03f827eb6e4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/108] 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 6523b912eec1f42e7271c046fec6a9605a788828 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/108] 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 2e0c6e8aff5dcc79eb0256e9afea7c7fd6d58f6b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/108] 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 5579c6840690284f486cbc673963645c558168f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/108] 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 335f652630b25246a058f1189f43209c9f2dede1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/108] 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 1e339beecd33f91b4f0ffeca71dc4b5a54a59053 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/108] 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 e4e2027673bb7682afa7c99c79b772d85091438a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/108] 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 1bc487b8cf4f9391ec21959198833bfc046e1ed1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/108] 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 f68e507f658351348f2c8428ea1e2fd9585469ff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/108] 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 3f700bcf02d37c8a192cc0643497f3e7fdf81233 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/108] 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 21848597c064492eb36690ed81616e797d746af2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/108] 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 6c93580957881a34342e193824acd3bd108fdb71 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/108] 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 085f421edf32baa13a342f22cf00045f3cace77e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/108] 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 1cb18c4847a73b0de0107f31d37ff71bd99bbeb8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/108] 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 fa71fba06b9d14bdd3e487346946264ba3e80c34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/108] 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 f63246196b6e0079301c45a7751b919cb29ea691 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/108] 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 0782f8f1ab95ffa1f19ded24a294d4f82777274b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/108] 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 50c2f41a8b61a1ad1b87f3a1096784f487209b26 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/108] 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 5c223f8ed39f222efe7dda60b7e400241aa1329c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/108] 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 39c9e5c9965bae39de7d3cee818a3de006244150 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/108] 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 7224c684832ec9d02933fe2d9d690dd230d5735d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/108] 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 ca407036b79f53538cd7ce6c689f72c3c2607ad6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/108] 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 03b02cb05b7ac29b0aedad66c93ad30487363e3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/108] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 a76bee16d3f5c222c99646575f92fe3fcf7652df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/108] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 13f67b4ad655296a22298018be3d88080af4892a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/108] 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 c542f3d31901e33d64225882d47dbf91b9c729af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/108] 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 f2d1149196cfe9c4c13a25da57c1f84b97ef50df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/108] 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 4bd09d6648467009f36fdaa053f3d1f1c9b125b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/108] 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 1d85eceb6e21e868191d26845e588d9cedb16872 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/108] 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 7c3d7ffda78fe9fe98071a8e62efc595083af3e8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/108] 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 5cf1ae4021867cf0c751783f83f5a3e7c5db6f66 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/108] 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 ecac2ecb8ab2a5faa52119f3902dba58b3958a27 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/108] 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 04bebca485407b6de7b4da56bf1bab1b8bb7c961 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/108] 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 15ddc0e00bc57f9e035eecc4fc7cd6dad49294b5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/108] 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 9159f860d81cd62a4979b113b875f76ca4c6f8d0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/108] 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 ca6feca242ef871a6913bbb7cf82402a68298055 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/108] 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 827edf9af4a294db7b1f0686d622c9d71fec30f9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/108] 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 a31c682f8963ab4857a3e712305960fdc18111d1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/108] 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 6a48f940845e4e78f256284a2d3b00042dac4df6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/108] 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 238c2658625252d9f89e3de017e8e51bbe8a6232 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/108] 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 5c6c7d049d699b1d6a541318b8f269b963c6cf91 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/108] 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 66f67213b6a8a980ae94cf280ca60f50d7348e4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/108] 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 bec04cf6c38dfc3d5b6fabd5ea13b60e38b203c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/108] 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 ff26422ae6e3370237a94097ef2c37eba8e217c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/108] 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 71353246dfb0334ecd6dcc86f3c15e5e7341b059 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/108] 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 b46d1ca3c7ca0bd0f6e81685db9dbbe84cd2aa3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/108] 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 216bf1c091f76996485e0ae41efaa2dfea585a15 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/108] 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 483756e1506ab808db8c8dd6174353685ec4340a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/108] 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 05d7427f6e8e76a5af01209fb98283e224944b0a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/108] 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..2d7804c5c319 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>=3.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 7e74acc0aeb69ad241887f4ec42a95a32d77ef8d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/108] 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..06b3ad30d0e0 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>=3.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>=40.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 5a99a98311572b8b50cb09ace55300fade8be0ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/108] 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 2a39e605c105ffc072ed44a51e8f6e34fbadeb3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/108] 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 06b3ad30d0e0..decc3bfd2bfa 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 ec3c9507ab386a9e981c27c691c509005f8be99c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/108] 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 2d7804c5c319..fedf6b594530 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 9e1fb40b8a7e32e72de17d84955ced501b8cef00 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/108] 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 53439d98a9c9d43bb804684e743ac63c16580fd3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/108] 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 3975ca8620f3fefe216c20892df9e4ce53589be2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/108] 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 294d60e71be09604a1a9a72227ebe881d5091c73 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/108] 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 3f92539c2c1a721e48e811f9598f7fb1ef1d3aef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/108] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 9fccb613a69a0ddf7905e91947ff1ea812af350d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/108] 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 79e11fcc237a010c5ff046c18ff9f348b4820854 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/108] 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 b5a7a24d307c9a123ac489c60086db5aadf9c0ec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/108] 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 a6a476d4925f2b76287ad4ca5f7b6c38f999ed9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/108] 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 9a68b043ad8716dfc0be1bdf8f36afd1fbe4ba9c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/108] 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 f2224168df4f0d97a67ba28fe339e18a2c392535 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/108] 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 c179269ae053c817812fe68bbc1fe797748d96ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/108] 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 a06c30a71000701b65ebd9eef52970bcb6c32ba3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/108] 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 72b6f57b2f24908aa4586f2e5c1c49f132f3d37c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/108] 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 0341c58f563f61a6504db05defeda194a1d10674 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/108] 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 b1ece9fd5f63bee764a6e4bd89510975552c58c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/108] 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 6fe567526f2f55030eb61fb379c076afe8a8dc93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/108] 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"

From 7cd9706a91a91e24bc05b21d73074f808316f3a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/108] 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 8abe1c0820701ae81053abf972726ec128707fb4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/108] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 141bb9a0ca426ce48d37dbd7db8ef7416be01b01 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/108] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 36cb990ffb7bc0bf9da3f9d4b221b310d836451e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/108] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 2ee7451ce8ff9834ecc617fa294983195eb39b24 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/108] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From ac73d50958ffa61834424372f02ba24874e36747 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/108] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From 89ef1fd70184fdd7f53d859fa38a0f553ddbf6ac Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 103/108] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 5c8fe686cdd4f0b070c71249baa2b264913add79 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 104/108] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 848a5955c9c58e956d5d419581e2c8390c759533 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 105/108] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From da838bdbdc4c4c4bdc86b1b5860005626a72c6db Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 106/108] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..264ad0c20802 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="gir vala doc"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 0e740f25fe2d8e652be83b8eca198f0463136197 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 107/108] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 5fd1252d630b6dd7bc5fef6cba1a1f3276e42bd8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 108/108] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 4 files changed, 385 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (51 preceding siblings ...)
  2021-04-06 10:59 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-06 11:18 ` Gottox
  2021-04-06 13:06 ` Gottox
                   ` (60 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06 11:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 166858 bytes --]

From 0ecd61ed03659f4c198673c62b6e7670086eceed 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 001/108] 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 1dfd164cc3b7e9cad661ebe10a5f1b80de1bb9e1 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 002/108] 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 449ebe0f384dc111111a619755a947218e61d3fc 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 003/108] 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 74445dd7b2decce74ccfe8e4bab535ec8c1a43af 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 004/108] 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 90e073aa2a9eb9bae329f04e08c348c8f0a9c1ec 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 005/108] 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 dd991487f3f124368dddcf23ed51cec6338420ad 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 006/108] 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 5670d7590051cdf55c7093aff3b88b257ad6ce73 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 007/108] 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 035d54cc01eef0fc326ca0b0b0f2c32ee636d870 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 008/108] 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 81f3f0a4a1b0c341bf77055b4d99eab0ee064f55 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 009/108] 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 c80fa7a5c12c03de93186e9b3ce8eef9ea768ffc 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 010/108] 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 9aa0a601250b..58c50865251c 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 08c97a8ed0d3e3087752a663b80312739d5fcd0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/108] 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 c694c50082d66a8b253caa8216eed948247c5b2d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/108] 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 8f17376c768dee9c9c3b8326378a29fa05ac5039 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/108] 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 fd9146a8ccd8f33c6e4acd106cf7a8802ea6a770 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/108] 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 53915552616350de1b8c9ac2cb448bea84d0fbe8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/108] 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 9ca6a25d623fc8d34ab4399417340a71e32a20c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/108] 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 8ee69a1e2f3bfc0d24db172f65bfa3ee1550338c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/108] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 58c50865251c..4126667b57c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 14709167d92a89bcf14fdc2dcad2e274f100659f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/108] 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 cb64131e7c741e9c5587b3b7a7d75bfebf8fc84f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/108] 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 73eba3f1ab042eb75dfbd0816fdfc85fc0f8ad8d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/108] 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 4660c61dbd7a1d6372e4ca5d64254848f1beff0a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/108] 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 4126667b57c6..97b2c3b05351 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 97bfb1b534ae6297a05751f9624195bd3948ce69 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/108] 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 97b2c3b05351..07cef8a8bc3e 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 20b5d1fac070590208207cbe989f9d696b8bedfc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/108] 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 31c4a2c1cacf9005d3e81bfe2d81eb0adecc0ae9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/108] 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 a1b48c8a64113be1df2edc00be851aa87cce78b6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/108] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From b709d47c5849c46797960f68d2cec24225960bb3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/108] 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 fcd00252c30874ec026c03b9cc33c03f827eb6e4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/108] 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 6523b912eec1f42e7271c046fec6a9605a788828 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/108] 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 2e0c6e8aff5dcc79eb0256e9afea7c7fd6d58f6b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/108] 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 5579c6840690284f486cbc673963645c558168f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/108] 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 335f652630b25246a058f1189f43209c9f2dede1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/108] 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 1e339beecd33f91b4f0ffeca71dc4b5a54a59053 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/108] 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 e4e2027673bb7682afa7c99c79b772d85091438a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/108] 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 1bc487b8cf4f9391ec21959198833bfc046e1ed1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/108] 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 f68e507f658351348f2c8428ea1e2fd9585469ff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/108] 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 3f700bcf02d37c8a192cc0643497f3e7fdf81233 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/108] 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 21848597c064492eb36690ed81616e797d746af2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/108] 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 6c93580957881a34342e193824acd3bd108fdb71 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/108] 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 085f421edf32baa13a342f22cf00045f3cace77e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/108] 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 1cb18c4847a73b0de0107f31d37ff71bd99bbeb8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/108] 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 fa71fba06b9d14bdd3e487346946264ba3e80c34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/108] 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 f63246196b6e0079301c45a7751b919cb29ea691 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/108] 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 0782f8f1ab95ffa1f19ded24a294d4f82777274b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/108] 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 50c2f41a8b61a1ad1b87f3a1096784f487209b26 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/108] 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 5c223f8ed39f222efe7dda60b7e400241aa1329c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/108] 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 39c9e5c9965bae39de7d3cee818a3de006244150 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/108] 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 7224c684832ec9d02933fe2d9d690dd230d5735d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/108] 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 ca407036b79f53538cd7ce6c689f72c3c2607ad6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/108] 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 03b02cb05b7ac29b0aedad66c93ad30487363e3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/108] 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 07cef8a8bc3e..fd622214ff69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 a76bee16d3f5c222c99646575f92fe3fcf7652df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/108] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index fd622214ff69..b7bfe0e237ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 13f67b4ad655296a22298018be3d88080af4892a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/108] 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 c542f3d31901e33d64225882d47dbf91b9c729af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/108] 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 f2d1149196cfe9c4c13a25da57c1f84b97ef50df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/108] 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 4bd09d6648467009f36fdaa053f3d1f1c9b125b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/108] 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 1d85eceb6e21e868191d26845e588d9cedb16872 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/108] 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 7c3d7ffda78fe9fe98071a8e62efc595083af3e8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/108] 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 5cf1ae4021867cf0c751783f83f5a3e7c5db6f66 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/108] 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 ecac2ecb8ab2a5faa52119f3902dba58b3958a27 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/108] 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 04bebca485407b6de7b4da56bf1bab1b8bb7c961 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/108] 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 15ddc0e00bc57f9e035eecc4fc7cd6dad49294b5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/108] 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 9159f860d81cd62a4979b113b875f76ca4c6f8d0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/108] 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 ca6feca242ef871a6913bbb7cf82402a68298055 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/108] 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 827edf9af4a294db7b1f0686d622c9d71fec30f9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/108] 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 a31c682f8963ab4857a3e712305960fdc18111d1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/108] 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 6a48f940845e4e78f256284a2d3b00042dac4df6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/108] 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 238c2658625252d9f89e3de017e8e51bbe8a6232 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/108] 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 5c6c7d049d699b1d6a541318b8f269b963c6cf91 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/108] 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 66f67213b6a8a980ae94cf280ca60f50d7348e4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/108] 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 bec04cf6c38dfc3d5b6fabd5ea13b60e38b203c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/108] 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 ff26422ae6e3370237a94097ef2c37eba8e217c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/108] 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 71353246dfb0334ecd6dcc86f3c15e5e7341b059 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/108] 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 b46d1ca3c7ca0bd0f6e81685db9dbbe84cd2aa3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/108] 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 216bf1c091f76996485e0ae41efaa2dfea585a15 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/108] 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 483756e1506ab808db8c8dd6174353685ec4340a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/108] 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 05d7427f6e8e76a5af01209fb98283e224944b0a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 075/108] 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..2d7804c5c319 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>=3.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 7e74acc0aeb69ad241887f4ec42a95a32d77ef8d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 076/108] 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..06b3ad30d0e0 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>=3.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>=40.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 5a99a98311572b8b50cb09ace55300fade8be0ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 077/108] 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 2a39e605c105ffc072ed44a51e8f6e34fbadeb3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 078/108] 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 06b3ad30d0e0..decc3bfd2bfa 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 ec3c9507ab386a9e981c27c691c509005f8be99c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 079/108] 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 2d7804c5c319..fedf6b594530 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 9e1fb40b8a7e32e72de17d84955ced501b8cef00 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 080/108] 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 53439d98a9c9d43bb804684e743ac63c16580fd3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 081/108] 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 3975ca8620f3fefe216c20892df9e4ce53589be2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 082/108] 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 294d60e71be09604a1a9a72227ebe881d5091c73 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 083/108] 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 3f92539c2c1a721e48e811f9598f7fb1ef1d3aef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 084/108] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 9fccb613a69a0ddf7905e91947ff1ea812af350d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 085/108] 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 79e11fcc237a010c5ff046c18ff9f348b4820854 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 086/108] 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 b5a7a24d307c9a123ac489c60086db5aadf9c0ec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 087/108] 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 a6a476d4925f2b76287ad4ca5f7b6c38f999ed9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 088/108] 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 9a68b043ad8716dfc0be1bdf8f36afd1fbe4ba9c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 089/108] 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 f2224168df4f0d97a67ba28fe339e18a2c392535 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 090/108] 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 c179269ae053c817812fe68bbc1fe797748d96ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 091/108] 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 a06c30a71000701b65ebd9eef52970bcb6c32ba3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 092/108] 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 72b6f57b2f24908aa4586f2e5c1c49f132f3d37c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 093/108] 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 0341c58f563f61a6504db05defeda194a1d10674 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 094/108] 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 b1ece9fd5f63bee764a6e4bd89510975552c58c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 095/108] 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 6fe567526f2f55030eb61fb379c076afe8a8dc93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 096/108] 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"

From 7cd9706a91a91e24bc05b21d73074f808316f3a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 097/108] 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 8abe1c0820701ae81053abf972726ec128707fb4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 098/108] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 141bb9a0ca426ce48d37dbd7db8ef7416be01b01 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 099/108] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 36cb990ffb7bc0bf9da3f9d4b221b310d836451e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 100/108] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 2ee7451ce8ff9834ecc617fa294983195eb39b24 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 101/108] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From ac73d50958ffa61834424372f02ba24874e36747 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 102/108] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From 89ef1fd70184fdd7f53d859fa38a0f553ddbf6ac Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 103/108] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 5c8fe686cdd4f0b070c71249baa2b264913add79 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 104/108] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 848a5955c9c58e956d5d419581e2c8390c759533 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 105/108] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From da838bdbdc4c4c4bdc86b1b5860005626a72c6db Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 106/108] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..264ad0c20802 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="gir vala doc"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 0e740f25fe2d8e652be83b8eca198f0463136197 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 107/108] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 5fd1252d630b6dd7bc5fef6cba1a1f3276e42bd8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 108/108] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 4 files changed, 385 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (52 preceding siblings ...)
  2021-04-06 11:18 ` Gottox
@ 2021-04-06 13:06 ` Gottox
  2021-04-06 13:09 ` [PR PATCH] [Updated] " Gottox
                   ` (59 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06 13:06 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
Okay, the issue does not occur on real hardware. There are some input issues on my gpd pocket 2, but I guess that's some upstream bug and the way the screen is rotated on that particular device.

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (53 preceding siblings ...)
  2021-04-06 13:06 ` Gottox
@ 2021-04-06 13:09 ` Gottox
  2021-04-06 13:09 ` Gottox
                   ` (58 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06 13:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 167424 bytes --]

From 7b4712e0bf82b7e01ec45942d4689e8da20621fb 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 001/108] 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 75e2cfd1233c9bf6a9f31043f0db99eb505827c1 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 002/108] 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 33fa78ff0be0909225e5fc66b9ab7b48814bd9f0 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 003/108] 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 605d13ee69258c208a90825267add3d65d392cef 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 004/108] 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 8b3be6a8a286909c8876a6f21d511341d51235b0 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 005/108] 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 b84b323a76c58ae0a1ff4ccbdbb68b569fc1fa9f 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 006/108] 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 2322b9e16910c243bfaf07c807557294002f584a 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 007/108] 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 6fb5b5d4923dad69354788e91e9ec61eea03d8d5 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 008/108] 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 28b4d144c7307051900cb73c42605ec3b559f56f 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 009/108] 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 e6a0bfaf507f14cd9c3dbbf00b80141bd3fb03b9 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 010/108] 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 40faf29b113a..149bcac83131 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 97b2ef84e9d3405e721ca15d35240b22eea53008 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/108] 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 7429b25eab0fff09bf8e00993fbc1201ad87073e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/108] 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 d48cacfed59614d17bda4068625f2786aeb1cdba Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/108] 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 62827732f8b0c7a9e07d296d459872776c10f136 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/108] 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 1a147c7240a511d8baf77dae16269e07fbd8419d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/108] 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 6a3cfad68ba85d57e3256a2f6ca6083d389b543b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/108] 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 e252ce6e7b0b1d8fc54c933e906dc42b1936303b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/108] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 149bcac83131..1ce2496700b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 75d072f549e276d5267eae5883afd70fe985d1da Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/108] 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 3e33c3187ed129ec0a77fa0db02b46d49244fee6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/108] 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 3314f420341dfb8c8aef22b9bedeed3a838e6fd2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/108] 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 af4231a27f2d60ba0450c21663a8865bd1ff98a0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/108] 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 1ce2496700b0..23b43078957c 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 d12ff651a2f6b52aca94076b799603e4d5e0f270 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/108] 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 23b43078957c..9d3857ae487d 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 9ac4a6c03df1b64850db998e6ddee32d690c1247 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/108] 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 ec09c0811f61f259b4db1aa5a76278e1950987b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/108] 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 e767f59bae99cb7373ce099615e6946433c301a0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/108] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From b5c24f6baac95f7b7dbe1c2479ffa72805c9ecee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/108] 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 dfcac0690f1fc44c8a921e2b28eb51c4a8a62cec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/108] 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 c6a2dddcf5cc62712486fa8d89f5b1c4d60f51c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/108] 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 09a31f1d3268d0b22f241872c7f837a95ae4e3e7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/108] 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 72c584e7ee9b9c83154132f483d45c4b0afa28ae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/108] 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 3b460f6bf6113f71d35f56e52869a5da3318b178 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/108] 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 001bd1ff5df41bdb29d691c395359ba56b61e102 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/108] 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 692fc0574a266d14649ba4b5fc804bf03ddcc9a8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/108] 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 e5f59f152180790da5d69ad407bf3fa3cc7e352e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/108] 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 e8cef6e4586c53d936029703b18d54dfa4f0a284 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/108] 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 0253bddcf5c29bd5cf19d15eafb7f0aac0488d51 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/108] 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 3cb05e5dbaaccba4340c10784ef027ef84ba6d7d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/108] 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 bf98c24c19583a50db65a3289a78119c560b5974 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/108] 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 5db60da167ceee54d2aa4e623a5e94d4afb4d9e3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/108] 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 84c5c94fa123997b5f497bada884234ce69d6378 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/108] 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 e2c7e110e78f63aaa4dea97d53010263b2bb27dd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/108] 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 99bb0f30018b070fbe4dc5f5d0f5c814e7138462 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/108] 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 4f2123f4a43319a748c96a1405903c62cdf26b8b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/108] 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 b62943b6868ad42060f019c68243b0ffb385a067 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/108] 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 27ecf50b7a549cdfcdad393509cfeb19fe068e52 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/108] 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 e996e8b251e37db355d991af0ada1a35e4aa4ecc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/108] 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 c172acf0be41b9e33d078b4616fa0e1324c3a8e0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/108] 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 a63f68ce1da3339bf1568bccaa023d889d283d22 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/108] 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 e0e321e7a3a42717239e7bd9425aaf8838ed1344 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/108] 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 9d3857ae487d..db2ec8df87c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 633cc4a16e83d681180b0cb33c96ddd5028926fd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/108] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index db2ec8df87c1..03b64a19694e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 841913563640b6d8fa26dd9eb182a29ad4e7b342 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/108] 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 87905ce2ba55f787388417e427ee7cc3c686da17 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/108] 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 3a4c601d79375ad99b78bb9b0c44de9101c9d070 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/108] 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 776544b8abf8d2e0ca56eef8861dd21f0a672494 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/108] 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 3b371f055f3a32f8f6322cf9c8f064e2e0a690c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/108] 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 6eda8c99be1df77b91cbf3edf71c95c1d9101984 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/108] 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 31918ede8d82642a28fc1c8b806ceca65386ae08 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/108] 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 67aa36dd8d34e1b643208dbd7c1b965f6fb70408 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/108] 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 ea1316cfeaa7d4442e0b9173a1fd9721f258ce72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/108] 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 f73478cadb0b567db8720a97551ad6a98e3f9ddb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/108] 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 566e0b59bb9c0edbe56a25644792c67eb587bf88 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/108] 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 bbb751affaf31409ac1947d6b3a9f91f916bc290 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/108] 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 dc5a362b57800bc8ea10b55d529849d6f6701be8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/108] 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 f4678bd1856565fb3144792afa25c22ec5de9bbc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/108] 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 1971c16bab86ac5df32703d3bf86f4fca630e5d5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/108] 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 9194209152b4ec88981473e16fa6677ffe11c61c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/108] 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 281c41c8fcc9b4ef3162a711d8a526c05eb84baa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/108] 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 21057e4f6ccd7697172a49d92faff8d2845b22d2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/108] 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 329570de55cafc85561699c06429c35f7b506241 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/108] 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 b8903ac1af30ab06257ee8f6b5eaf302146b990b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/108] 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 116ef8a79dddb595f5d262839b3b22809b8cdf2e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/108] 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 9dcaa4f79f705b66838f6c2fcf949f90c398581e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/108] 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 cf02470e5725ee325ea455e05cbac7ba1903eab8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/108] 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 4673ff72c74206b6dec4bbd2c4a1036dfa6510f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/108] 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 8dc5b9bb329b3bc182b290a0816dd7e18c1bebce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 075/108] 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 f17e00ac107cc586726287f72d6c50fde0e3c0a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 076/108] 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 1a2b71973ade97c4ce2317f99feaa504edba9240 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 077/108] 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 466aa3ea2889705449c68e9cda0f6370b2c5ef39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 078/108] 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 1ed91892e4946c4b232d2e23f053b8ce0b18111a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 079/108] 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 ae913489d5bf5886673e3c14234bbe61cb67527f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 080/108] 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 6c6c534bc2cc025dc58a8ab1449fbdec9f97ba66 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 081/108] 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 44186df337b447a299d19b6e1fcc9e9e738d1250 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 082/108] 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 1b52230c872098c6781d0d68ea5af8cc0f864e42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 083/108] 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 6707236a776f82a3c68ceecb0500e978a79c357c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 084/108] 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 5bf1f0f587e54df14c26fdc5673e74d472f7886a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 085/108] 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 cf9f2dd47c95d639a547373b60ccbb6afe3096bc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 086/108] 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 d6d1a763a3216311fa903571d34707845dd5c4ca Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 087/108] 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 f76fe1d74482edf6f3193ac58f6dbf5018d8bbe7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 088/108] 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 e66ea8de48290f356a63fadb4fd37671f7e26537 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 089/108] 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 7b85eca57584bb36221f4d732be85a46d02569f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 090/108] 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 320d24378edd836df5ca0f1258a762b6f8b72abe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 091/108] 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"

From ea02e9454e913fcd373ac5b92bf1deb04bf53c6d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 092/108] 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 6163726c4e47a4aead1927d7bd3641b6f516e08d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 093/108] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 5ffab9b2600861670a4c700087330b0f0a3e4add Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 094/108] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 0c2551a5b18915c9fcfe49fc9709e49b0c3fdaf6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 095/108] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From fbfc9d741e43aa6ad54da84101a38e7a6fc8ede6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 096/108] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 347610efb390750e399952f3bf9c1fcc10e08b7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 097/108] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From f951ad0513c6fd8cc62d962d1d06520dd93547ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 098/108] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 1be91e572f2aa627479b05b11d8d4c9c08855989 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 099/108] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 8e69e63d9a01b92b7166ff80d1da4896e159eb43 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 100/108] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From bc273fac1fe33f13cdfa2d3a641bbbf22109aacf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 101/108] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..264ad0c20802 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="gir vala doc"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From c3a11e4ebc1ca764e6f6a9d43f5e4f05235afe24 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 102/108] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 9011b955544118da15f3ed6a254a45ea47051a2a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 103/108] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   1 +
 5 files changed, 386 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 542e59df3add..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -15,6 +15,7 @@ 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=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From 6e1812032962f48134b263c60ccd7cc22984fead Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 104/108] 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..2d7804c5c319 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>=3.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 2fe39f04ec24536e5dbe5a21b504a6b81c6152ef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 105/108] 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 2d7804c5c319..fedf6b594530 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 0dca1e64aea7e36c9637fea9078d68e23fdec000 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 106/108] 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..06b3ad30d0e0 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>=3.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>=40.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 73a20cc14f781fe2305772f26ce1b2679e566252 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 107/108] 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 06b3ad30d0e0..decc3bfd2bfa 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 9aa26aae444d7fc6b08429baeb3d246992f36d99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 108/108] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (54 preceding siblings ...)
  2021-04-06 13:09 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-06 13:09 ` Gottox
  2021-04-06 19:00 ` [PR PATCH] [Updated] " Gottox
                   ` (57 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06 13:09 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
@void-linux/pkg-committers Feel free to review! :1st_place_medal: 

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (55 preceding siblings ...)
  2021-04-06 13:09 ` Gottox
@ 2021-04-06 19:00 ` Gottox
  2021-04-07  2:27 ` fosslinux
                   ` (56 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-06 19:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 168495 bytes --]

From 7b4712e0bf82b7e01ec45942d4689e8da20621fb 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 001/109] 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 75e2cfd1233c9bf6a9f31043f0db99eb505827c1 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 002/109] 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 33fa78ff0be0909225e5fc66b9ab7b48814bd9f0 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 003/109] 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 605d13ee69258c208a90825267add3d65d392cef 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 004/109] 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 8b3be6a8a286909c8876a6f21d511341d51235b0 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 005/109] 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 b84b323a76c58ae0a1ff4ccbdbb68b569fc1fa9f 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 006/109] 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 2322b9e16910c243bfaf07c807557294002f584a 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 007/109] 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 6fb5b5d4923dad69354788e91e9ec61eea03d8d5 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 008/109] 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 28b4d144c7307051900cb73c42605ec3b559f56f 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 009/109] 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 e6a0bfaf507f14cd9c3dbbf00b80141bd3fb03b9 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 010/109] 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 40faf29b113a..149bcac83131 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 97b2ef84e9d3405e721ca15d35240b22eea53008 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/109] 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 7429b25eab0fff09bf8e00993fbc1201ad87073e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/109] 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 d48cacfed59614d17bda4068625f2786aeb1cdba Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/109] 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 62827732f8b0c7a9e07d296d459872776c10f136 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/109] 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 1a147c7240a511d8baf77dae16269e07fbd8419d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/109] 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 6a3cfad68ba85d57e3256a2f6ca6083d389b543b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/109] 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 e252ce6e7b0b1d8fc54c933e906dc42b1936303b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/109] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 149bcac83131..1ce2496700b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 75d072f549e276d5267eae5883afd70fe985d1da Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/109] 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 3e33c3187ed129ec0a77fa0db02b46d49244fee6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/109] 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 3314f420341dfb8c8aef22b9bedeed3a838e6fd2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/109] 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 af4231a27f2d60ba0450c21663a8865bd1ff98a0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/109] 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 1ce2496700b0..23b43078957c 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 d12ff651a2f6b52aca94076b799603e4d5e0f270 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/109] 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 23b43078957c..9d3857ae487d 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 9ac4a6c03df1b64850db998e6ddee32d690c1247 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/109] 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 ec09c0811f61f259b4db1aa5a76278e1950987b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/109] 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 e767f59bae99cb7373ce099615e6946433c301a0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/109] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From b5c24f6baac95f7b7dbe1c2479ffa72805c9ecee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:29 +0200
Subject: [PATCH 026/109] 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 dfcac0690f1fc44c8a921e2b28eb51c4a8a62cec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 027/109] 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 c6a2dddcf5cc62712486fa8d89f5b1c4d60f51c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 028/109] 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 09a31f1d3268d0b22f241872c7f837a95ae4e3e7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 029/109] 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 72c584e7ee9b9c83154132f483d45c4b0afa28ae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 030/109] 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 3b460f6bf6113f71d35f56e52869a5da3318b178 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 031/109] 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 001bd1ff5df41bdb29d691c395359ba56b61e102 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 032/109] 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 692fc0574a266d14649ba4b5fc804bf03ddcc9a8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 033/109] 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 e5f59f152180790da5d69ad407bf3fa3cc7e352e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 034/109] 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 e8cef6e4586c53d936029703b18d54dfa4f0a284 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 035/109] 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 0253bddcf5c29bd5cf19d15eafb7f0aac0488d51 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 036/109] 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 3cb05e5dbaaccba4340c10784ef027ef84ba6d7d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 037/109] 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 bf98c24c19583a50db65a3289a78119c560b5974 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 038/109] 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 5db60da167ceee54d2aa4e623a5e94d4afb4d9e3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 039/109] 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 84c5c94fa123997b5f497bada884234ce69d6378 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 040/109] 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 e2c7e110e78f63aaa4dea97d53010263b2bb27dd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 041/109] 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 99bb0f30018b070fbe4dc5f5d0f5c814e7138462 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 042/109] 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 4f2123f4a43319a748c96a1405903c62cdf26b8b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 043/109] 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 b62943b6868ad42060f019c68243b0ffb385a067 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 044/109] 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 27ecf50b7a549cdfcdad393509cfeb19fe068e52 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 045/109] 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 e996e8b251e37db355d991af0ada1a35e4aa4ecc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 046/109] 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 c172acf0be41b9e33d078b4616fa0e1324c3a8e0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 047/109] 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 a63f68ce1da3339bf1568bccaa023d889d283d22 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 048/109] 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 e0e321e7a3a42717239e7bd9425aaf8838ed1344 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 049/109] 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 9d3857ae487d..db2ec8df87c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 633cc4a16e83d681180b0cb33c96ddd5028926fd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 050/109] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index db2ec8df87c1..03b64a19694e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 841913563640b6d8fa26dd9eb182a29ad4e7b342 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 051/109] 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 87905ce2ba55f787388417e427ee7cc3c686da17 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 052/109] 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 3a4c601d79375ad99b78bb9b0c44de9101c9d070 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 053/109] 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 776544b8abf8d2e0ca56eef8861dd21f0a672494 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 054/109] 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 3b371f055f3a32f8f6322cf9c8f064e2e0a690c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 055/109] 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 6eda8c99be1df77b91cbf3edf71c95c1d9101984 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 056/109] 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 31918ede8d82642a28fc1c8b806ceca65386ae08 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 057/109] 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 67aa36dd8d34e1b643208dbd7c1b965f6fb70408 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 058/109] 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 ea1316cfeaa7d4442e0b9173a1fd9721f258ce72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 059/109] 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 f73478cadb0b567db8720a97551ad6a98e3f9ddb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 060/109] 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 566e0b59bb9c0edbe56a25644792c67eb587bf88 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 061/109] 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 bbb751affaf31409ac1947d6b3a9f91f916bc290 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 062/109] 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 dc5a362b57800bc8ea10b55d529849d6f6701be8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 063/109] 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 f4678bd1856565fb3144792afa25c22ec5de9bbc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 064/109] 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 1971c16bab86ac5df32703d3bf86f4fca630e5d5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 065/109] 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 9194209152b4ec88981473e16fa6677ffe11c61c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 066/109] 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 281c41c8fcc9b4ef3162a711d8a526c05eb84baa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 067/109] 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 21057e4f6ccd7697172a49d92faff8d2845b22d2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 068/109] 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 329570de55cafc85561699c06429c35f7b506241 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 069/109] 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 b8903ac1af30ab06257ee8f6b5eaf302146b990b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 070/109] 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 116ef8a79dddb595f5d262839b3b22809b8cdf2e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 071/109] 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 9dcaa4f79f705b66838f6c2fcf949f90c398581e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 072/109] 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 cf02470e5725ee325ea455e05cbac7ba1903eab8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 073/109] 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 4673ff72c74206b6dec4bbd2c4a1036dfa6510f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 074/109] 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 8dc5b9bb329b3bc182b290a0816dd7e18c1bebce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 075/109] 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 f17e00ac107cc586726287f72d6c50fde0e3c0a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 076/109] 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 1a2b71973ade97c4ce2317f99feaa504edba9240 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 077/109] 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 466aa3ea2889705449c68e9cda0f6370b2c5ef39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 078/109] 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 1ed91892e4946c4b232d2e23f053b8ce0b18111a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 079/109] 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 ae913489d5bf5886673e3c14234bbe61cb67527f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 080/109] 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 6c6c534bc2cc025dc58a8ab1449fbdec9f97ba66 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 081/109] 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 44186df337b447a299d19b6e1fcc9e9e738d1250 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 082/109] 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 1b52230c872098c6781d0d68ea5af8cc0f864e42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 083/109] 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 6707236a776f82a3c68ceecb0500e978a79c357c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 084/109] 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 5bf1f0f587e54df14c26fdc5673e74d472f7886a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 085/109] 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 cf9f2dd47c95d639a547373b60ccbb6afe3096bc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 086/109] 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 d6d1a763a3216311fa903571d34707845dd5c4ca Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 087/109] 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 f76fe1d74482edf6f3193ac58f6dbf5018d8bbe7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 088/109] 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 e66ea8de48290f356a63fadb4fd37671f7e26537 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 089/109] 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 7b85eca57584bb36221f4d732be85a46d02569f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 090/109] 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 320d24378edd836df5ca0f1258a762b6f8b72abe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 091/109] 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"

From ea02e9454e913fcd373ac5b92bf1deb04bf53c6d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 092/109] 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 6163726c4e47a4aead1927d7bd3641b6f516e08d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 093/109] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 5ffab9b2600861670a4c700087330b0f0a3e4add Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 094/109] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 0c2551a5b18915c9fcfe49fc9709e49b0c3fdaf6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 095/109] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From fbfc9d741e43aa6ad54da84101a38e7a6fc8ede6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 096/109] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 347610efb390750e399952f3bf9c1fcc10e08b7a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 097/109] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From f951ad0513c6fd8cc62d962d1d06520dd93547ed Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 098/109] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 1be91e572f2aa627479b05b11d8d4c9c08855989 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 099/109] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 8e69e63d9a01b92b7166ff80d1da4896e159eb43 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 100/109] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From bc273fac1fe33f13cdfa2d3a641bbbf22109aacf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 101/109] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..264ad0c20802 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="gir vala doc"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From c3a11e4ebc1ca764e6f6a9d43f5e4f05235afe24 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 102/109] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 9011b955544118da15f3ed6a254a45ea47051a2a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 103/109] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   1 +
 5 files changed, 386 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 542e59df3add..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -15,6 +15,7 @@ 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=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From 6e1812032962f48134b263c60ccd7cc22984fead Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 104/109] 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..2d7804c5c319 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>=3.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 2fe39f04ec24536e5dbe5a21b504a6b81c6152ef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 105/109] 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 2d7804c5c319..fedf6b594530 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 0dca1e64aea7e36c9637fea9078d68e23fdec000 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 106/109] 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..06b3ad30d0e0 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>=3.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>=40.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 73a20cc14f781fe2305772f26ce1b2679e566252 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 107/109] 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 06b3ad30d0e0..decc3bfd2bfa 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 9aa26aae444d7fc6b08429baeb3d246992f36d99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 108/109] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 aecfae5938c9724bc9c02c610a5e3d22200ff9af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 109/109] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..0efd15dec63b 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
 python_version=2 #unverified
 lib32disabled=yes

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (56 preceding siblings ...)
  2021-04-06 19:00 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-07  2:27 ` fosslinux
  2021-04-07  7:10 ` Gottox
                   ` (55 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: fosslinux @ 2021-04-07  2:27 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

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

Comment:
Do we care about QEMU enough to hold of merging until that bug is fixed?

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (57 preceding siblings ...)
  2021-04-07  2:27 ` fosslinux
@ 2021-04-07  7:10 ` Gottox
  2021-04-07  7:13 ` Gottox
                   ` (54 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:10 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
We also need to think about rearranging the dependencies. Installing gnome itself doesn't result in a usable system as the drivers are missing. `xbps-install xorg gnome` installs those drivers, so that's the shortcut I'm using. But I think that should be done in a dedicated PR.

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (58 preceding siblings ...)
  2021-04-07  7:10 ` Gottox
@ 2021-04-07  7:13 ` Gottox
  2021-04-07  7:37 ` [PR REVIEW] " Piraty
                   ` (53 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:13 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
@fosslinux imho having gnome in qemu is not a common usecase. I only do that for testing and verifying.

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (59 preceding siblings ...)
  2021-04-07  7:13 ` Gottox
@ 2021-04-07  7:37 ` Piraty
  2021-04-07  7:37 ` Piraty
                   ` (52 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Piraty @ 2021-04-07  7:37 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

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

Comment:
better keep them sorted

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (60 preceding siblings ...)
  2021-04-07  7:37 ` [PR REVIEW] " Piraty
@ 2021-04-07  7:37 ` Piraty
  2021-04-07  7:37 ` Piraty
                   ` (51 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Piraty @ 2021-04-07  7:37 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

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

Comment:
put build options at the end

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (61 preceding siblings ...)
  2021-04-07  7:37 ` Piraty
@ 2021-04-07  7:37 ` Piraty
  2021-04-07  7:37 ` Piraty
                   ` (50 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Piraty @ 2021-04-07  7:37 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

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

Comment:
looks like tzdata is in fact a runtime dependency (it's silently pulled by base-system though ...)

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (63 preceding siblings ...)
  2021-04-07  7:37 ` Piraty
@ 2021-04-07  7:37 ` Piraty
  2021-04-07  7:37 ` Piraty
                   ` (48 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Piraty @ 2021-04-07  7:37 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

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

Comment:
keep them sorted

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (64 preceding siblings ...)
  2021-04-07  7:37 ` Piraty
@ 2021-04-07  7:37 ` Piraty
  2021-04-07  7:37 ` Piraty
                   ` (47 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Piraty @ 2021-04-07  7:37 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

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

Comment:
0.15 is out (not sure if odds are dev releases)

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (62 preceding siblings ...)
  2021-04-07  7:37 ` Piraty
@ 2021-04-07  7:37 ` Piraty
  2021-04-07  7:37 ` Piraty
                   ` (49 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Piraty @ 2021-04-07  7:37 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

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

Comment:
you could glob as well

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (65 preceding siblings ...)
  2021-04-07  7:37 ` Piraty
@ 2021-04-07  7:37 ` Piraty
  2021-04-07  7:39 ` Gottox
                   ` (46 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Piraty @ 2021-04-07  7:37 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

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

Comment:
5.1.1 is out

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (66 preceding siblings ...)
  2021-04-07  7:37 ` Piraty
@ 2021-04-07  7:39 ` Gottox
  2021-04-07  7:39 ` Gottox
                   ` (45 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:39 UTC (permalink / raw)
  To: ml

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

New review comment by Gottox on void-packages repository

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

Comment:
I better keep this as it is. I this could result in silent errors.

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (67 preceding siblings ...)
  2021-04-07  7:39 ` Gottox
@ 2021-04-07  7:39 ` Gottox
  2021-04-07  7:40 ` Gottox
                   ` (44 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:39 UTC (permalink / raw)
  To: ml

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

New review comment by Gottox on void-packages repository

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

Comment:
I better keep this as it is. This could result in silent errors.

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (68 preceding siblings ...)
  2021-04-07  7:39 ` Gottox
@ 2021-04-07  7:40 ` Gottox
  2021-04-07  7:43 ` Gottox
                   ` (43 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:40 UTC (permalink / raw)
  To: ml

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

Comment:
fixed

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (69 preceding siblings ...)
  2021-04-07  7:40 ` Gottox
@ 2021-04-07  7:43 ` Gottox
  2021-04-07  7:43 ` Gottox
                   ` (42 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:43 UTC (permalink / raw)
  To: ml

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

New review comment by Gottox on void-packages repository

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

Comment:
set as `depends`.

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (70 preceding siblings ...)
  2021-04-07  7:43 ` Gottox
@ 2021-04-07  7:43 ` Gottox
  2021-04-07  7:45 ` Gottox
                   ` (41 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:43 UTC (permalink / raw)
  To: ml

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

Comment:
fixed

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (71 preceding siblings ...)
  2021-04-07  7:43 ` Gottox
@ 2021-04-07  7:45 ` Gottox
  2021-04-07  7:46 ` Gottox
                   ` (40 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:45 UTC (permalink / raw)
  To: ml

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

Comment:
fixed

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (72 preceding siblings ...)
  2021-04-07  7:45 ` Gottox
@ 2021-04-07  7:46 ` Gottox
  2021-04-07  7:53 ` Gottox
                   ` (39 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:46 UTC (permalink / raw)
  To: ml

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

New review comment by Gottox on void-packages repository

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

Comment:
afaik folks follows the gnome release style. 0.15 is unstable.

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (73 preceding siblings ...)
  2021-04-07  7:46 ` Gottox
@ 2021-04-07  7:53 ` Gottox
  2021-04-07  7:53 ` Gottox
                   ` (38 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:53 UTC (permalink / raw)
  To: ml

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

New review comment by Gottox on void-packages repository

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

Comment:
It's not really a gnome product, so these updates weren't in scope. But hey, let's do it.

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (74 preceding siblings ...)
  2021-04-07  7:53 ` Gottox
@ 2021-04-07  7:53 ` Gottox
  2021-04-07  8:03 ` Gottox
                   ` (37 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  7:53 UTC (permalink / raw)
  To: ml

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

New review comment by Gottox on void-packages repository

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

Comment:
It's not really a gnome product, so these updates weren't in scope. But hey, let's do it.

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (75 preceding siblings ...)
  2021-04-07  7:53 ` Gottox
@ 2021-04-07  8:03 ` Gottox
  2021-04-07  8:04 ` [PR PATCH] [Updated] " Gottox
                   ` (36 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  8:03 UTC (permalink / raw)
  To: ml

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

New review comment by Gottox on void-packages repository

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

Comment:
Eh,... There's a bit of patching going on. I'll update that in its own PR.

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (76 preceding siblings ...)
  2021-04-07  8:03 ` Gottox
@ 2021-04-07  8:04 ` Gottox
  2021-04-07  8:05 ` [PR REVIEW] " Gottox
                   ` (35 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  8:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 168750 bytes --]

From 0077d56e9d648da7f4df043bcf8dcc9a442a1c12 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 001/109] 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 427c31ec77450d4f8db27b64f9c288daa0ea89c7 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 002/109] 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 1fcaae4796134a579376b5139d77ce311ff3af7d 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 003/109] 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..450d393b09c0 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="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 9857aacda43bd08e29403b20bf6b3b4845b57812 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 004/109] 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 125af6d19be13622e902942bd44e09d3851d9cbc 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 005/109] 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 c04e1d9d0c5ac05118b2f8dd52fe3ac9b43de865 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 006/109] 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 02a54b051e3fabb52220a6f99e6382dcefb0a223 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 007/109] 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 584ae96ce56e81715e6bd335f864998467854d53 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 008/109] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 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)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="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 2ab463d39d1e2a995a37485de3caf5d01673b181 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 009/109] 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 9c96a6d22dac3243bee0da85b0cde083abe75dd8 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 010/109] 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 40faf29b113a..149bcac83131 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 65f06589b3e9a8840fe530cf9b65a8c7fee240a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/109] 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 647a61e2e2bd490d523057d3954114052230c5c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/109] 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 2b52286499a647b6eeba1d9b40761753599b277a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/109] 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 b82c6487c2364d9590b5235f7816ab7dd07973be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/109] 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 072857c19e0e10c88ecc0bf2059a2407b2f04f94 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/109] 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 55867a98dd0f34f07cc4e3ba89379fecee6f547d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/109] 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 532b5367be3de1b20386e1b51cd33382789ed04a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/109] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 149bcac83131..1ce2496700b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From ec1b482e858ac6b30f276f0c73a5ab1a21862c2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/109] 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 815643d11eabe79a506dcddcd7118b2e135aeb62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/109] 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 e89cc88d1e5996552fb3275dc5061f8817869877 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/109] 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 5bdbe6863d0e6a9ab7926e7f7e525fc7988a6058 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/109] 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 1ce2496700b0..23b43078957c 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 33e317071be92d6be55df45841fd1fa8b08694c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/109] 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 23b43078957c..9d3857ae487d 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 669b96797df26827aaa91db02c6c6f9c2d4e8c45 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/109] 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 aae74985d2d14cf549f350c5babc7f23e2a2ce7d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/109] 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 4836e32a4c01e31ecf72d9dd7bd8c61add3e4ec0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/109] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 8fee7d4392832c347410ff1be21c076c5d68c505 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 026/109] 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 070edd5f659f700b1a633317c5e0368bc956ff8b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 027/109] 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 2b1fd0092164032284b262aa49e3a60c2edeb010 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 028/109] 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 816cf2afd0773f173382cb9daf687a4f50408178 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 029/109] 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 e11cdf3cbd73509fd2afd3d6e5ccb4b0144b759e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 030/109] 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 e6321b983bed45cdbd2985571224b92e40d3940c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 031/109] 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 5b0ddc0d6259956878aa054b294e81dab8587986 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 032/109] 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 5f5c7d0caa7fd62b18293868f903099a5237f921 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 033/109] 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 f0b36e0f0a9b3e409aac296710897fc798f4322c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 034/109] 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 4a3e43e0801bd1f89fc330d912920f149a441b6f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 035/109] 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 1bb238ce06fad6032fd22bdaf0bd515b300ebe3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 036/109] 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 0febdaee2364235d49a6625c81ebfddf327a414c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 037/109] 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 bcd9556c36becde31b2fb4ecce20e6d22d602389 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 038/109] 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 67a8c6dc632729a1b949b2c32363a2b7140d3eef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 039/109] 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 70a112265faf4986d84cf9a4def1ed9dead13e4f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 040/109] 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 1c7662deaba959fa61a817b9cdba071b51df04ef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 041/109] 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 72c909a0237328a206babc465aa2283b858bf024 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 042/109] 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 697f6d016d5d96dfa4e663c24ea5500ac34d371b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 043/109] 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 b33effc7c763cb9151d07a29576a7ea9271647cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 044/109] 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 3d3361d04ec08737949d3f74c27f79e7a519a82d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 045/109] 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 55c6460912288011ebdae0889fd2e841175a8a20 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 046/109] 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 00bf9acf682e78595a87f72b2a69d020c7ad873f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 047/109] 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 1cf4196cb816ce27e28b7d04e054c83200b815a8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 048/109] 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 9d3857ae487d..db2ec8df87c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 006485cfc48c2934d0200f48330c5ba3131a7ac5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 049/109] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index db2ec8df87c1..03b64a19694e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 893638add26c660bc77f0cc33fd7ab9e0cea8f93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 050/109] 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 852fc29a6ac5d9e028d10f7fe978a0d8f8cbc10f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 051/109] 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 3c31841f7299f64ab3efcc4acc0074b11e2b94af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 052/109] 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 d56ea8aba357dfc1081b79c02996475985596c10 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 053/109] 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 63ef215d8435b86b5b1e62b3db39d906e4943749 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 054/109] 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 f5aa0452ef474afc7eccf18e3b851ad43f62d9f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 055/109] 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 d4ffcdb46eca6838f3927477911c84a5aae9743c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 056/109] 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 00813258c707e19c7e382ffc6233030474301432 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 057/109] 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 e27d5d1979a7c2da6347a7afc573770489fb9345 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 058/109] 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 b31bfe659e423bc030db7090ec9c79f5bab0276d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 059/109] 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 0d36dfcc259be0a822c7fc7ed06b75d45facd87a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 060/109] 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 02d510c9d64c41f4564d888604630ad7bf545b5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 061/109] 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 ddb829fb58ff1dfd67df9d571bf9165e611c6f84 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 062/109] 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 2e5ad6edecf6645d9fa844b0d7323751070e2511 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 063/109] 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 07e4b5e78f1cfc9548d933e93ccdba2d71131ef8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 064/109] 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 fd03976cd8bedd207c735d28e077f0a322174065 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 065/109] 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 ba820217c0e52e4639f0b5b8c2681deea553845e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 066/109] 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 c8f870d57680b94478b2554392701ab2814d5764 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 067/109] 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 2648e164d9c08606fe63707977b702f01303cde4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 068/109] 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 9b3e0cef3c2faa7e0f6174aa016f32afa3a06288 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 069/109] 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 0b7a5aa06c80eb1f2804cad8fed3f9c7d1d7e063 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 070/109] 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 a57770c109f3db64d92e274cf024f610ebd3bd53 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 071/109] 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 a42cbb83607d6b2f266fed93bf599dcec240b839 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 072/109] 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 05948ef9b3e36fe8e8c534a77a0b58c441bbc506 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 073/109] 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 eaf29fea0909c3b3ee23d7fd1d9641f3655d995e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 074/109] 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 9058d5e292899654c3b09cf1f8c8d4a5f7ad6f4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 075/109] 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 f6287ae0464dd911a08591926890e32e70063b99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 076/109] 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 abc6b69f07692f89cbce12cec280d0d06a5ff8a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 077/109] 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 11fcfc88e182144dd0a5205eef71c3cefb57a258 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 078/109] 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 29fce5db150a69f2c497c0d3e3e8f0569f30bb9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 079/109] 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 5ed33135ee6bc81b82603654488204fc512d8845 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 080/109] 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 f2d862958418b3f00f865f5a75c1ddda1a1966fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 081/109] 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 afdc26223315747f5d87cdf214f85d486432a015 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 082/109] 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 d2b68e9a4c323e6a55d4d82b6251afdacc24bb5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 083/109] 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 de751d82a8f62f1236d94ac48c34d322efebb9fb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 084/109] 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 433b599855ca3dff4de45b57599f9a4221a750dd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 085/109] 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 e29b744b4469229efa6410b8302eca9a601155a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 086/109] 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 72c9fe7ee945d1711f1989732944738adeca0787 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 087/109] 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 993bfd4e70c610e9f5d49a583f1492b462450554 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 088/109] 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 8918dcc8aaa077d0f01b7e56b4e1b0aeb8c0e7bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 089/109] 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 92e6ca9bb59cb6dedd43ded68d51675b8381725a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 090/109] 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"

From 7159cfdb6b790fc75d3ca3d7f393fde1ddcca856 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 091/109] 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 5e0a25fe2d96990484fac6d24a6c7260d3d4d1f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 092/109] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From fad5649310aafe70315137a4369555647f46485f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 093/109] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 029a93b76ae825bde749703a1ea93e8bbe03843b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 094/109] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 8c2068cfbd19fd76c448138fcabdf021494b5809 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 095/109] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From e14490ead0d7ee18100b0bde275c17a76ac7fccd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 096/109] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From cdfb6d5aa30ac8daedbf24f5b7937dd7bab5b22c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 097/109] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 5d3b9e57bb531644ecc9769bc9f64e4785fac84f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 098/109] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From cf293e931ecc2270ea0da3e46f8d1035b8fbdc8e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 099/109] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From f593c6e160df28769bc1065e3d64752d50389f9a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 100/109] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 6ed29400e59f2c5f52c295723017aa2d25acdc58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 101/109] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 9b841a114d802994eebe6dfc7f59f31194b03358 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 102/109] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   1 +
 5 files changed, 386 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 542e59df3add..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -15,6 +15,7 @@ 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=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From ef6d7d111bb84889087dd7182f98d6f81fcc73ac Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 103/109] 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..2d7804c5c319 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>=3.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 098041606db436e5cb0c26c821e9f0ea40157bde Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 104/109] 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 2d7804c5c319..fedf6b594530 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 54f968bf5d780c1599f29fca3fa007fb20a00602 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 105/109] 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..06b3ad30d0e0 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>=3.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>=40.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 d3e736104efd7365de8ae53de2fd6576ce14a33a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 106/109] 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 06b3ad30d0e0..decc3bfd2bfa 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 fc6e5d81e6a43c9ad67eb8f0f058babe30ececad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 107/109] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 c54ca4dda96725496c607865a45788b79dc1537c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 108/109] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..0efd15dec63b 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
 python_version=2 #unverified
 lib32disabled=yes

From be5b13e2b9e5421cd816dedf28bd5b9f8455e398 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 7 Apr 2021 09:52:00 +0200
Subject: [PATCH 109/109] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index f292438ad31f..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
-revision=2
+version=2.6.9
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (77 preceding siblings ...)
  2021-04-07  8:04 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-07  8:05 ` Gottox
  2021-04-07  8:06 ` Gottox
                   ` (34 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  8:05 UTC (permalink / raw)
  To: ml

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

New review comment by Gottox on void-packages repository

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

Comment:
done

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (78 preceding siblings ...)
  2021-04-07  8:05 ` [PR REVIEW] " Gottox
@ 2021-04-07  8:06 ` Gottox
  2021-04-07 11:35 ` [PR REVIEW] " sgn
                   ` (33 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-07  8:06 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
@Piraty changes were applied!

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (79 preceding siblings ...)
  2021-04-07  8:06 ` Gottox
@ 2021-04-07 11:35 ` sgn
  2021-04-07 11:35 ` sgn
                   ` (32 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: sgn @ 2021-04-07 11:35 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

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

Comment:
glob has a bug, those files will be moved into `${DESTDIR}/usr/lib/mutter-*/` literally (I've run into this myself).

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (80 preceding siblings ...)
  2021-04-07 11:35 ` [PR REVIEW] " sgn
@ 2021-04-07 11:35 ` sgn
  2021-04-07 12:25 ` Piraty
                   ` (31 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: sgn @ 2021-04-07 11:35 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

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

Comment:
(our) glob (helper) has a bug, those files will be moved into `${DESTDIR}/usr/lib/mutter-*/` literally (I've run into this myself).

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (81 preceding siblings ...)
  2021-04-07 11:35 ` sgn
@ 2021-04-07 12:25 ` Piraty
  2021-04-08  0:56 ` circhioz
                   ` (30 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Piraty @ 2021-04-07 12:25 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

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

Comment:
agree @Gottox 

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (82 preceding siblings ...)
  2021-04-07 12:25 ` Piraty
@ 2021-04-08  0:56 ` circhioz
  2021-04-08  0:56 ` circhioz
                   ` (29 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: circhioz @ 2021-04-08  0:56 UTC (permalink / raw)
  To: ml

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

New review comment by circhioz on void-packages repository

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

Comment:
`tracker-devel` here is not needed, `gnome-books` has been ported to `tracker3`

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (84 preceding siblings ...)
  2021-04-08  0:56 ` circhioz
@ 2021-04-08  0:56 ` circhioz
  2021-04-08  1:14 ` circhioz
                   ` (27 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: circhioz @ 2021-04-08  0:56 UTC (permalink / raw)
  To: ml

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

New review comment by circhioz on void-packages repository

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

Comment:
Should depend on `tracker3`

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (83 preceding siblings ...)
  2021-04-08  0:56 ` circhioz
@ 2021-04-08  0:56 ` circhioz
  2021-04-08  0:56 ` circhioz
                   ` (28 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: circhioz @ 2021-04-08  0:56 UTC (permalink / raw)
  To: ml

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

New review comment by circhioz on void-packages repository

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

Comment:
`tracker-devel` here is not needed, `gnome-boxes` has been ported to `tracker3`

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (85 preceding siblings ...)
  2021-04-08  0:56 ` circhioz
@ 2021-04-08  1:14 ` circhioz
  2021-04-08  9:03 ` [PR REVIEW] " Gottox
                   ` (26 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: circhioz @ 2021-04-08  1:14 UTC (permalink / raw)
  To: ml

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

New comment by circhioz on void-packages repository

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

Comment:
`gnome-latex` should be rebuilt for `tepl-6`. There's an upstream commit on master https://gitlab.gnome.org/GNOME/gnome-latex/-/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (86 preceding siblings ...)
  2021-04-08  1:14 ` circhioz
@ 2021-04-08  9:03 ` Gottox
  2021-04-08  9:05 ` Gottox
                   ` (25 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08  9:03 UTC (permalink / raw)
  To: ml

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

Comment:
fixed

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (87 preceding siblings ...)
  2021-04-08  9:03 ` [PR REVIEW] " Gottox
@ 2021-04-08  9:05 ` Gottox
  2021-04-08  9:05 ` Gottox
                   ` (24 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08  9:05 UTC (permalink / raw)
  To: ml

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

Comment:
fixed

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

* Re: [PR REVIEW] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (88 preceding siblings ...)
  2021-04-08  9:05 ` Gottox
@ 2021-04-08  9:05 ` Gottox
  2021-04-08  9:28 ` [PR PATCH] [Updated] " Gottox
                   ` (23 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08  9:05 UTC (permalink / raw)
  To: ml

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

Comment:
fixed

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (89 preceding siblings ...)
  2021-04-08  9:05 ` Gottox
@ 2021-04-08  9:28 ` Gottox
  2021-04-08  9:28 ` Gottox
                   ` (22 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08  9:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 176170 bytes --]

From 0077d56e9d648da7f4df043bcf8dcc9a442a1c12 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 001/112] 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 427c31ec77450d4f8db27b64f9c288daa0ea89c7 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 002/112] 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 1fcaae4796134a579376b5139d77ce311ff3af7d 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 003/112] 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..450d393b09c0 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="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 9857aacda43bd08e29403b20bf6b3b4845b57812 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 004/112] 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 125af6d19be13622e902942bd44e09d3851d9cbc 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 005/112] 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 c04e1d9d0c5ac05118b2f8dd52fe3ac9b43de865 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 006/112] 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 02a54b051e3fabb52220a6f99e6382dcefb0a223 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 007/112] 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 584ae96ce56e81715e6bd335f864998467854d53 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 008/112] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 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)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="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 2ab463d39d1e2a995a37485de3caf5d01673b181 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 009/112] 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 9c96a6d22dac3243bee0da85b0cde083abe75dd8 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 010/112] 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 40faf29b113a..149bcac83131 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 65f06589b3e9a8840fe530cf9b65a8c7fee240a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/112] 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 647a61e2e2bd490d523057d3954114052230c5c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/112] 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 2b52286499a647b6eeba1d9b40761753599b277a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/112] 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 b82c6487c2364d9590b5235f7816ab7dd07973be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/112] 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 072857c19e0e10c88ecc0bf2059a2407b2f04f94 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/112] 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 55867a98dd0f34f07cc4e3ba89379fecee6f547d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/112] 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 532b5367be3de1b20386e1b51cd33382789ed04a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/112] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 149bcac83131..1ce2496700b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From ec1b482e858ac6b30f276f0c73a5ab1a21862c2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/112] 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 815643d11eabe79a506dcddcd7118b2e135aeb62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/112] 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 e89cc88d1e5996552fb3275dc5061f8817869877 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/112] 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 5bdbe6863d0e6a9ab7926e7f7e525fc7988a6058 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/112] 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 1ce2496700b0..23b43078957c 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 33e317071be92d6be55df45841fd1fa8b08694c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/112] 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 23b43078957c..9d3857ae487d 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 669b96797df26827aaa91db02c6c6f9c2d4e8c45 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/112] 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 aae74985d2d14cf549f350c5babc7f23e2a2ce7d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/112] 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 4836e32a4c01e31ecf72d9dd7bd8c61add3e4ec0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/112] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 8fee7d4392832c347410ff1be21c076c5d68c505 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 026/112] 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 070edd5f659f700b1a633317c5e0368bc956ff8b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 027/112] 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 2b1fd0092164032284b262aa49e3a60c2edeb010 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 028/112] 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 816cf2afd0773f173382cb9daf687a4f50408178 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 029/112] 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 e11cdf3cbd73509fd2afd3d6e5ccb4b0144b759e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 030/112] 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 e6321b983bed45cdbd2985571224b92e40d3940c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 031/112] 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 5b0ddc0d6259956878aa054b294e81dab8587986 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 032/112] 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 5f5c7d0caa7fd62b18293868f903099a5237f921 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 033/112] 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 f0b36e0f0a9b3e409aac296710897fc798f4322c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 034/112] 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 4a3e43e0801bd1f89fc330d912920f149a441b6f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 035/112] 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 1bb238ce06fad6032fd22bdaf0bd515b300ebe3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 036/112] 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 0febdaee2364235d49a6625c81ebfddf327a414c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 037/112] 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 bcd9556c36becde31b2fb4ecce20e6d22d602389 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 038/112] 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 67a8c6dc632729a1b949b2c32363a2b7140d3eef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 039/112] 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 70a112265faf4986d84cf9a4def1ed9dead13e4f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 040/112] 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 1c7662deaba959fa61a817b9cdba071b51df04ef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 041/112] 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 72c909a0237328a206babc465aa2283b858bf024 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 042/112] 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 697f6d016d5d96dfa4e663c24ea5500ac34d371b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 043/112] 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 b33effc7c763cb9151d07a29576a7ea9271647cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 044/112] 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 3d3361d04ec08737949d3f74c27f79e7a519a82d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 045/112] 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 55c6460912288011ebdae0889fd2e841175a8a20 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 046/112] 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 00bf9acf682e78595a87f72b2a69d020c7ad873f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 047/112] 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 1cf4196cb816ce27e28b7d04e054c83200b815a8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 048/112] 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 9d3857ae487d..db2ec8df87c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 006485cfc48c2934d0200f48330c5ba3131a7ac5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 049/112] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index db2ec8df87c1..03b64a19694e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 893638add26c660bc77f0cc33fd7ab9e0cea8f93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 050/112] 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 852fc29a6ac5d9e028d10f7fe978a0d8f8cbc10f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 051/112] 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 3c31841f7299f64ab3efcc4acc0074b11e2b94af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 052/112] 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 d56ea8aba357dfc1081b79c02996475985596c10 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 053/112] 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 63ef215d8435b86b5b1e62b3db39d906e4943749 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 054/112] 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 f5aa0452ef474afc7eccf18e3b851ad43f62d9f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 055/112] 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 d4ffcdb46eca6838f3927477911c84a5aae9743c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 056/112] 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 00813258c707e19c7e382ffc6233030474301432 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 057/112] 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 e27d5d1979a7c2da6347a7afc573770489fb9345 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 058/112] 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 b31bfe659e423bc030db7090ec9c79f5bab0276d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 059/112] 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 0d36dfcc259be0a822c7fc7ed06b75d45facd87a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 060/112] 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 02d510c9d64c41f4564d888604630ad7bf545b5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 061/112] 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 ddb829fb58ff1dfd67df9d571bf9165e611c6f84 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 062/112] 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 2e5ad6edecf6645d9fa844b0d7323751070e2511 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 063/112] 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 07e4b5e78f1cfc9548d933e93ccdba2d71131ef8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 064/112] 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 fd03976cd8bedd207c735d28e077f0a322174065 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 065/112] 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 ba820217c0e52e4639f0b5b8c2681deea553845e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 066/112] 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 c8f870d57680b94478b2554392701ab2814d5764 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 067/112] 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 2648e164d9c08606fe63707977b702f01303cde4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 068/112] 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 9b3e0cef3c2faa7e0f6174aa016f32afa3a06288 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 069/112] 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 0b7a5aa06c80eb1f2804cad8fed3f9c7d1d7e063 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 070/112] 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 a57770c109f3db64d92e274cf024f610ebd3bd53 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 071/112] 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 a42cbb83607d6b2f266fed93bf599dcec240b839 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 072/112] 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 05948ef9b3e36fe8e8c534a77a0b58c441bbc506 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 073/112] 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 eaf29fea0909c3b3ee23d7fd1d9641f3655d995e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 074/112] 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 9058d5e292899654c3b09cf1f8c8d4a5f7ad6f4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 075/112] 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 f6287ae0464dd911a08591926890e32e70063b99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 076/112] 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 abc6b69f07692f89cbce12cec280d0d06a5ff8a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 077/112] 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 11fcfc88e182144dd0a5205eef71c3cefb57a258 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 078/112] 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 29fce5db150a69f2c497c0d3e3e8f0569f30bb9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 079/112] 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 5ed33135ee6bc81b82603654488204fc512d8845 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 080/112] 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 f2d862958418b3f00f865f5a75c1ddda1a1966fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 081/112] 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 afdc26223315747f5d87cdf214f85d486432a015 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 082/112] 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 d2b68e9a4c323e6a55d4d82b6251afdacc24bb5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 083/112] 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 de751d82a8f62f1236d94ac48c34d322efebb9fb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 084/112] 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 433b599855ca3dff4de45b57599f9a4221a750dd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 085/112] 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 e29b744b4469229efa6410b8302eca9a601155a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 086/112] 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 72c9fe7ee945d1711f1989732944738adeca0787 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 087/112] 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 993bfd4e70c610e9f5d49a583f1492b462450554 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 088/112] 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 8918dcc8aaa077d0f01b7e56b4e1b0aeb8c0e7bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 089/112] 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 92e6ca9bb59cb6dedd43ded68d51675b8381725a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 090/112] 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"

From 7159cfdb6b790fc75d3ca3d7f393fde1ddcca856 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 091/112] 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 5e0a25fe2d96990484fac6d24a6c7260d3d4d1f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 092/112] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From fad5649310aafe70315137a4369555647f46485f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 093/112] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 029a93b76ae825bde749703a1ea93e8bbe03843b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 094/112] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 8c2068cfbd19fd76c448138fcabdf021494b5809 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 095/112] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From e14490ead0d7ee18100b0bde275c17a76ac7fccd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 096/112] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From cdfb6d5aa30ac8daedbf24f5b7937dd7bab5b22c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 097/112] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 5d3b9e57bb531644ecc9769bc9f64e4785fac84f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 098/112] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From cf293e931ecc2270ea0da3e46f8d1035b8fbdc8e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 099/112] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From f593c6e160df28769bc1065e3d64752d50389f9a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 100/112] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 6ed29400e59f2c5f52c295723017aa2d25acdc58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 101/112] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 9b841a114d802994eebe6dfc7f59f31194b03358 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 102/112] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   1 +
 5 files changed, 386 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 542e59df3add..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -15,6 +15,7 @@ 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=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From ef6d7d111bb84889087dd7182f98d6f81fcc73ac Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 103/112] 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..2d7804c5c319 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>=3.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 098041606db436e5cb0c26c821e9f0ea40157bde Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 104/112] 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 2d7804c5c319..fedf6b594530 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 54f968bf5d780c1599f29fca3fa007fb20a00602 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 105/112] 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..06b3ad30d0e0 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>=3.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>=40.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 d3e736104efd7365de8ae53de2fd6576ce14a33a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 106/112] 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 06b3ad30d0e0..decc3bfd2bfa 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 fc6e5d81e6a43c9ad67eb8f0f058babe30ececad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 107/112] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 c54ca4dda96725496c607865a45788b79dc1537c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 108/112] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..0efd15dec63b 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
 python_version=2 #unverified
 lib32disabled=yes

From be5b13e2b9e5421cd816dedf28bd5b9f8455e398 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 7 Apr 2021 09:52:00 +0200
Subject: [PATCH 109/112] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index f292438ad31f..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
-revision=2
+version=2.6.9
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From 9907714067965ec8aa04477e1c8a6e7f558f527f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:02:58 +0200
Subject: [PATCH 110/112] gnome-books: tracker-devel is no longer needed

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index bcb27e87c8ed..feb752614ace 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -6,7 +6,7 @@ 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
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
  gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From b8f9293f0027f8b781f40d0f9d56fe89bc20741a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:05:32 +0200
Subject: [PATCH 111/112] gnome-boxes: depend on tracker3 instead of tracker

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index 06c2804b6870..af6d13eb4fc2 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -8,9 +8,9 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
  libhandy1-devel tracker3-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"

From d3d0daa858d2ca0bac275dd5da006d3cb45a6c38 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 112/112] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  |  9 +-
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..46536a91003e 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,13 +1,15 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
  $(vopt_enable gir introspection)"
 hostmakedepends="glib-devel intltool itstool pkg-config vala yelp
  $(vopt_if gir gobject-introspection)"
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
  gtk+3-devel libgee08-devel libglib-devel tepl-devel"
 short_desc="LaTeX editor for the GNOME desktop"
@@ -19,3 +21,8 @@ checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (90 preceding siblings ...)
  2021-04-08  9:28 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-08  9:28 ` Gottox
  2021-04-08  9:29 ` Gottox
                   ` (21 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08  9:28 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
> `gnome-latex` should be rebuilt for `tepl-6`. There's an upstream commit on master https://gitlab.gnome.org/GNOME/gnome-latex/-/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9

Why not wait for a release?

> `gnome-latex` should be rebuilt for `tepl-6`. There's an upstream commit on master https://gitlab.gnome.org/GNOME/gnome-latex/-/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9

fixed

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (91 preceding siblings ...)
  2021-04-08  9:28 ` Gottox
@ 2021-04-08  9:29 ` Gottox
  2021-04-08  9:30 ` Gottox
                   ` (20 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08  9:29 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
> `gnome-latex` should be rebuilt for `tepl-6`. There's an upstream commit on master https://gitlab.gnome.org/GNOME/gnome-latex/-/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9

fixed

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (92 preceding siblings ...)
  2021-04-08  9:29 ` Gottox
@ 2021-04-08  9:30 ` Gottox
  2021-04-08  9:49 ` [PR PATCH] [Updated] " Gottox
                   ` (19 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08  9:30 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
Any further blockers? I'll merge around friday evening 18:00 CET.

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (93 preceding siblings ...)
  2021-04-08  9:30 ` Gottox
@ 2021-04-08  9:49 ` Gottox
  2021-04-08 10:58 ` Gottox
                   ` (18 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08  9:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 176170 bytes --]

From 0077d56e9d648da7f4df043bcf8dcc9a442a1c12 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 001/112] 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 427c31ec77450d4f8db27b64f9c288daa0ea89c7 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 002/112] 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 1fcaae4796134a579376b5139d77ce311ff3af7d 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 003/112] 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..450d393b09c0 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="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 9857aacda43bd08e29403b20bf6b3b4845b57812 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 004/112] 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 125af6d19be13622e902942bd44e09d3851d9cbc 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 005/112] 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 c04e1d9d0c5ac05118b2f8dd52fe3ac9b43de865 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 006/112] 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 02a54b051e3fabb52220a6f99e6382dcefb0a223 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 007/112] 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 584ae96ce56e81715e6bd335f864998467854d53 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 008/112] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 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)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="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 2ab463d39d1e2a995a37485de3caf5d01673b181 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 009/112] 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 9c96a6d22dac3243bee0da85b0cde083abe75dd8 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 010/112] 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 40faf29b113a..149bcac83131 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 65f06589b3e9a8840fe530cf9b65a8c7fee240a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/112] 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 647a61e2e2bd490d523057d3954114052230c5c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/112] 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 2b52286499a647b6eeba1d9b40761753599b277a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/112] 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 b82c6487c2364d9590b5235f7816ab7dd07973be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/112] 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 072857c19e0e10c88ecc0bf2059a2407b2f04f94 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/112] 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 55867a98dd0f34f07cc4e3ba89379fecee6f547d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/112] 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 532b5367be3de1b20386e1b51cd33382789ed04a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/112] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 149bcac83131..1ce2496700b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From ec1b482e858ac6b30f276f0c73a5ab1a21862c2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/112] 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 815643d11eabe79a506dcddcd7118b2e135aeb62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/112] 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 e89cc88d1e5996552fb3275dc5061f8817869877 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/112] 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 5bdbe6863d0e6a9ab7926e7f7e525fc7988a6058 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/112] 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 1ce2496700b0..23b43078957c 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 33e317071be92d6be55df45841fd1fa8b08694c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/112] 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 23b43078957c..9d3857ae487d 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 669b96797df26827aaa91db02c6c6f9c2d4e8c45 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/112] 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 aae74985d2d14cf549f350c5babc7f23e2a2ce7d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/112] 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 4836e32a4c01e31ecf72d9dd7bd8c61add3e4ec0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/112] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..355c2781bebb 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
@@ -8,13 +8,18 @@ build_helper="gir"
 configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 depends="gir-freedesktop python3-cairo"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 8fee7d4392832c347410ff1be21c076c5d68c505 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 026/112] 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 070edd5f659f700b1a633317c5e0368bc956ff8b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 027/112] 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 2b1fd0092164032284b262aa49e3a60c2edeb010 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 028/112] 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 816cf2afd0773f173382cb9daf687a4f50408178 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 029/112] 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 e11cdf3cbd73509fd2afd3d6e5ccb4b0144b759e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 030/112] 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 e6321b983bed45cdbd2985571224b92e40d3940c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 031/112] 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 5b0ddc0d6259956878aa054b294e81dab8587986 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 032/112] 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 5f5c7d0caa7fd62b18293868f903099a5237f921 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 033/112] 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 f0b36e0f0a9b3e409aac296710897fc798f4322c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 034/112] 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 4a3e43e0801bd1f89fc330d912920f149a441b6f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 035/112] 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 1bb238ce06fad6032fd22bdaf0bd515b300ebe3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 036/112] 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 0febdaee2364235d49a6625c81ebfddf327a414c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 037/112] 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 bcd9556c36becde31b2fb4ecce20e6d22d602389 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 038/112] 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 67a8c6dc632729a1b949b2c32363a2b7140d3eef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 039/112] 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 70a112265faf4986d84cf9a4def1ed9dead13e4f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 040/112] 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 1c7662deaba959fa61a817b9cdba071b51df04ef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 041/112] 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 72c909a0237328a206babc465aa2283b858bf024 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 042/112] 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 697f6d016d5d96dfa4e663c24ea5500ac34d371b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 043/112] 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 b33effc7c763cb9151d07a29576a7ea9271647cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 044/112] 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 3d3361d04ec08737949d3f74c27f79e7a519a82d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 045/112] 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 55c6460912288011ebdae0889fd2e841175a8a20 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 046/112] 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 00bf9acf682e78595a87f72b2a69d020c7ad873f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 047/112] 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 1cf4196cb816ce27e28b7d04e054c83200b815a8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 048/112] 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 9d3857ae487d..db2ec8df87c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 006485cfc48c2934d0200f48330c5ba3131a7ac5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 049/112] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index db2ec8df87c1..03b64a19694e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 893638add26c660bc77f0cc33fd7ab9e0cea8f93 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 050/112] 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 852fc29a6ac5d9e028d10f7fe978a0d8f8cbc10f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 051/112] 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 3c31841f7299f64ab3efcc4acc0074b11e2b94af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 052/112] 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 d56ea8aba357dfc1081b79c02996475985596c10 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 053/112] 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 63ef215d8435b86b5b1e62b3db39d906e4943749 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 054/112] 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 f5aa0452ef474afc7eccf18e3b851ad43f62d9f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 055/112] 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 d4ffcdb46eca6838f3927477911c84a5aae9743c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 056/112] 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 00813258c707e19c7e382ffc6233030474301432 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 057/112] 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 e27d5d1979a7c2da6347a7afc573770489fb9345 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 058/112] 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 b31bfe659e423bc030db7090ec9c79f5bab0276d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 059/112] 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 0d36dfcc259be0a822c7fc7ed06b75d45facd87a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 060/112] 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 02d510c9d64c41f4564d888604630ad7bf545b5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 061/112] 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 ddb829fb58ff1dfd67df9d571bf9165e611c6f84 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 062/112] 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 2e5ad6edecf6645d9fa844b0d7323751070e2511 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 063/112] 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 07e4b5e78f1cfc9548d933e93ccdba2d71131ef8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 064/112] 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 fd03976cd8bedd207c735d28e077f0a322174065 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 065/112] 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 ba820217c0e52e4639f0b5b8c2681deea553845e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 066/112] 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 c8f870d57680b94478b2554392701ab2814d5764 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 067/112] 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 2648e164d9c08606fe63707977b702f01303cde4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 068/112] 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 9b3e0cef3c2faa7e0f6174aa016f32afa3a06288 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 069/112] 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 0b7a5aa06c80eb1f2804cad8fed3f9c7d1d7e063 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 070/112] 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 a57770c109f3db64d92e274cf024f610ebd3bd53 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 071/112] 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 a42cbb83607d6b2f266fed93bf599dcec240b839 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 072/112] 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 05948ef9b3e36fe8e8c534a77a0b58c441bbc506 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 073/112] 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 eaf29fea0909c3b3ee23d7fd1d9641f3655d995e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 074/112] 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 9058d5e292899654c3b09cf1f8c8d4a5f7ad6f4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 075/112] 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 f6287ae0464dd911a08591926890e32e70063b99 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 076/112] 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 abc6b69f07692f89cbce12cec280d0d06a5ff8a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 077/112] 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 11fcfc88e182144dd0a5205eef71c3cefb57a258 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 078/112] 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 29fce5db150a69f2c497c0d3e3e8f0569f30bb9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 079/112] 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 5ed33135ee6bc81b82603654488204fc512d8845 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 080/112] 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 f2d862958418b3f00f865f5a75c1ddda1a1966fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 081/112] 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 afdc26223315747f5d87cdf214f85d486432a015 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 082/112] 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 d2b68e9a4c323e6a55d4d82b6251afdacc24bb5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 083/112] 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 de751d82a8f62f1236d94ac48c34d322efebb9fb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 084/112] 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 433b599855ca3dff4de45b57599f9a4221a750dd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 085/112] 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 e29b744b4469229efa6410b8302eca9a601155a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 086/112] 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 72c9fe7ee945d1711f1989732944738adeca0787 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 087/112] 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 993bfd4e70c610e9f5d49a583f1492b462450554 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 088/112] 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 8918dcc8aaa077d0f01b7e56b4e1b0aeb8c0e7bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 089/112] 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 92e6ca9bb59cb6dedd43ded68d51675b8381725a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 090/112] 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"

From 7159cfdb6b790fc75d3ca3d7f393fde1ddcca856 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 091/112] 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 5e0a25fe2d96990484fac6d24a6c7260d3d4d1f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 092/112] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From fad5649310aafe70315137a4369555647f46485f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 093/112] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 029a93b76ae825bde749703a1ea93e8bbe03843b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 094/112] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 8c2068cfbd19fd76c448138fcabdf021494b5809 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 095/112] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From e14490ead0d7ee18100b0bde275c17a76ac7fccd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 096/112] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..83fe867c8605 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true"
 hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
+checkdepends="xvfb-run"
 depends="python3-gobject hicolor-icon-theme"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From cdfb6d5aa30ac8daedbf24f5b7937dd7bab5b22c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 097/112] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 5d3b9e57bb531644ecc9769bc9f64e4785fac84f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 098/112] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From cf293e931ecc2270ea0da3e46f8d1035b8fbdc8e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 099/112] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From f593c6e160df28769bc1065e3d64752d50389f9a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 100/112] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 6ed29400e59f2c5f52c295723017aa2d25acdc58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 101/112] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 9b841a114d802994eebe6dfc7f59f31194b03358 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 102/112] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   1 +
 5 files changed, 386 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 542e59df3add..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -15,6 +15,7 @@ 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=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From ef6d7d111bb84889087dd7182f98d6f81fcc73ac Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 103/112] 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..2d7804c5c319 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>=3.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 098041606db436e5cb0c26c821e9f0ea40157bde Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 104/112] 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 2d7804c5c319..fedf6b594530 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 54f968bf5d780c1599f29fca3fa007fb20a00602 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 105/112] 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..06b3ad30d0e0 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>=3.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>=40.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 d3e736104efd7365de8ae53de2fd6576ce14a33a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 106/112] 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 06b3ad30d0e0..decc3bfd2bfa 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 fc6e5d81e6a43c9ad67eb8f0f058babe30ececad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 107/112] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 c54ca4dda96725496c607865a45788b79dc1537c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 108/112] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..0efd15dec63b 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
 python_version=2 #unverified
 lib32disabled=yes

From be5b13e2b9e5421cd816dedf28bd5b9f8455e398 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 7 Apr 2021 09:52:00 +0200
Subject: [PATCH 109/112] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index f292438ad31f..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
-revision=2
+version=2.6.9
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From 9907714067965ec8aa04477e1c8a6e7f558f527f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:02:58 +0200
Subject: [PATCH 110/112] gnome-books: tracker-devel is no longer needed

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index bcb27e87c8ed..feb752614ace 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -6,7 +6,7 @@ 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
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
  gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From b8f9293f0027f8b781f40d0f9d56fe89bc20741a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:05:32 +0200
Subject: [PATCH 111/112] gnome-boxes: depend on tracker3 instead of tracker

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index 06c2804b6870..af6d13eb4fc2 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -8,9 +8,9 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
  libhandy1-devel tracker3-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"

From d3d0daa858d2ca0bac275dd5da006d3cb45a6c38 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 112/112] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  |  9 +-
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..46536a91003e 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,13 +1,15 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
  $(vopt_enable gir introspection)"
 hostmakedepends="glib-devel intltool itstool pkg-config vala yelp
  $(vopt_if gir gobject-introspection)"
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
  gtk+3-devel libgee08-devel libglib-devel tepl-devel"
 short_desc="LaTeX editor for the GNOME desktop"
@@ -19,3 +21,8 @@ checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (94 preceding siblings ...)
  2021-04-08  9:49 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-08 10:58 ` Gottox
  2021-04-08 10:59 ` Gottox
                   ` (17 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08 10:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 179232 bytes --]

From a16f3de2e98815f41d46ef70f0360db595f5a2d6 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 001/115] 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 f875d101a2deefe2e6811a8424135571489bfce1 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 002/115] 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 91e375db0dae7367202013ee7b9240d3d18a4105 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 003/115] 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..450d393b09c0 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="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From dfac560ed4f602c681631849574659233dc905ba 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 004/115] 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 c71deac44403cce7a9c964eb8c1b580fd352e331 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 005/115] 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 e16948fb688d9a2055a3dc3244690c391da91182 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 006/115] 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 5df6e60d4d1f5752d63cd75a75b26f3412b0e4e5 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 007/115] 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 30ec6e918e0c6c3d5b66c0048b84ff8f98409910 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 008/115] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 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)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="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 60ae230c7f3a8ad0f9a0adf5eb419b45402f563a 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 009/115] 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 29d58adbcc59a3bcc255c30fc0493f72ae9030dd 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 010/115] 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 70be7e00c51d..99fdf5b6d15f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2923,15 +2923,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 9d6d5d78c814e7c6386bbefeadefb593d2069491 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/115] 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 b5fa3ff3357654044618c6aff781fa2067b48520 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/115] 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 cb638616cc9b4ab60d5fbd827d2b12189ab22451 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/115] 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 5fd6a6b64ddfef61e47d8b24fcda9d146a97b9be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/115] 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 e76043e8082317503f0c9957f0f3f4e1a7d36fff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/115] 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 ffeac5aae068b3b162b1ef8dcf927bdf2e88c9d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/115] 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 ade2921e759faa407906cb3d265d5686b5ebf982 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/115] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 99fdf5b6d15f..fe53085481df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 39733678a902f3613ee60b0cda1afcd1fd9ede65 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/115] 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 3b400f124aea2f5e4b8be3f2c0b9171f357bf011 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/115] 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 8f70dc10d735df4287172ae3500afdbf48fe640d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/115] 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 2020a561764f9a0caae2aed408ff7e3e16f2556b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/115] 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 fe53085481df..c811001868a7 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 2bd25f716da8befc19fa7e47a3454bf410580716 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/115] 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 c811001868a7..0e3386130501 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 c08bf9d0cf6b6454e0131d83030e65aa0aac2373 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/115] 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 adfba3e1209b50f15a6f87afd228f1d5fcba5988 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/115] 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 466cb1214e3c6f2e00809aaf1055de1721fcfce7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/115] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..851af74f1da4 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
@@ -9,12 +9,17 @@ configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
 depends="gir-freedesktop python3-cairo"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From fefa4719d989029ce4e02745f35a5bc672b4df4f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 026/115] 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 9a8a2e81437605f94228c741c6118fd7d7034097 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 027/115] 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 e4d3bb5835071cb4bb536967a5623772a588340f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 028/115] 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 f86de0c8426c1fa66d773caba24c9ebda4a5e592 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 029/115] 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 9a3e6a6e311d110baec6abd329103a2c7f3d8cab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 030/115] 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 d04cad531ec8d22a7ae6d6e8d9ad19fd3d96d2eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 031/115] 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 a570f071893c613663ee2882be7cd24b00299c39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 032/115] 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 bfdf843efeb8d3d5e9b8cdd46587f8cb65781d30 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 033/115] 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 e10ce9151edd6deb584af5f721f87f1c95e5df9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 034/115] 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 7993532e5cc20d45faf727f3ecb4269d6a3e8f90 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 035/115] 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 a02eb79448a0ba5785b54717bbb5ceb20090aacf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 036/115] 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 92a96e1708f3d5fa595fec3fab9a0971dca4c13e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 037/115] 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 c66cfeb84c5a17c09890d1cc848cd56f68c589c8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 038/115] 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 ac781f701b7ab68fd373708739df5d6d1f597aa9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 039/115] 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 d2a66945eca386bce3b011fb472265166cee3a91 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 040/115] 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 0d67238ea99ab550cf3c6be63f212769ea521304 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 041/115] 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 05045810b081ff50937fa2fb85ee2b255927c4f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 042/115] 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 7d63cfeb07545103410498f85b321168ce0deb48 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 043/115] 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 915af7f0fd8320fd3699513912e06dc868098a54 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 044/115] 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 4551655e3aba1f28ac8e35a17d8cfb2bf0f7d148 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 045/115] 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 58575ab921f26fe140818ab556c861347cac45f2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 046/115] 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 7883f3526d0b73a3d05b862de59e7ff7c9cd0286 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 047/115] 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 a3ea176e6704a6f8bb216237d157904d67b48b29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 048/115] 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 0e3386130501..c9f12b534d07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3452,7 +3452,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 94c1ccf176509b3a49c6f023757a62ef2290f9c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 049/115] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index c9f12b534d07..47739516eb7f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3571,7 +3571,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From a7bd9a6334110940e1f07d2ae84d9526365bf57a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 050/115] 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 48779b63b610d45a22508c2cd8976b474aeb8c7e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 051/115] 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 7bbc9cf612cb8a475ca34e38c5c6c454cbaf8f63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 052/115] 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 4bb849f8ce9aceb2bb38d19281bde2c0581186fe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 053/115] 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 57ae532e5b2ae41d70488765f2221cc51a58be73 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 054/115] 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 ba7efbcbdf71fdf63fe2d6d4039f30f508b6a499 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 055/115] 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 c977c5a2e70f94cf904b9334dc64b05ca149e96e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 056/115] 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 9ffc0131b8d537f960fb668230c6dcce034419a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 057/115] 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 e6f95b28b00d23b920c96795fcd7fa1d9a007ad9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 058/115] 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 045df4d6bbb2e45385bdd88315dbde61a2ba1cdf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 059/115] 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 ad4e8b81c4a0501265e0e3d831d9d40900de5e1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 060/115] 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 fa6b37f7c111ccac7df3334cbd7b9fde85b6f705 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 061/115] 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 07b73fee6d98cf02710d2f9abb18610b8065c249 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 062/115] 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 829b3ab1150408ae8c0e2d8a612629ff74f2a2ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 063/115] 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 d57e44c0ac8941c65a7af30650eaa4e1f49a54ac Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 064/115] 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 836c52f405745e0e69fc9157043e1d3c9aea66ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 065/115] 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 6b0e99c1590b69da1084b97ed4ee943c97843954 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 066/115] 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 f3067f714d5de7738c019eb89f173d89fa7cd922 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 067/115] 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 439c6d92392f2d6dc676b5180886128b25ec3f5e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 068/115] 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 9c1ad409c58a52b662e2d7e31cd44e1a8fe1b105 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 069/115] 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 20a39f61cf1453a55cf436784e43b2efa03834ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 070/115] 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 5a5f30433658723c43e578b7e4b745f2632c0b9a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 071/115] 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 4b0e454ef5724d317c0db3361b9b2065f6000711 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 072/115] 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 c46ee35edc44b033367a5c2f3ef6d62f7473441d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 073/115] 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 9c21e8aa92a332bd3fff0ddce4c246759e425a84 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 074/115] 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 bcb078ebd991f9d7833527ac9a42a0d488bfa933 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 075/115] 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 f9f11572c5a6429a69e3988ad3e1f2a524acc28e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 076/115] 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 602d37c02f581602367eab45a4c4d651262f5698 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 077/115] 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 cc7eae465183a995e52b53f7637a466cb3e55e46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 078/115] 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 3e82968c64abd8e4b324cbbea38894431a1b6b5e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 079/115] 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 c34e0ffd21957327a3dfc7226268a229309c6793 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 080/115] 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 383b04fc1dfff8624d30a3caa567dc8b3aa44cd2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 081/115] 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 f5ba065132bcabecabe8c17f87d94e84a8ab07d9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 082/115] 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 26255df0e966492ab591b603536d8c5ad03b9750 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 083/115] jsonrpc-glib: update to 3.38.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..b17223455261 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"
@@ -34,4 +34,3 @@ jsonrpc-glib-devel_package() {
 		fi
 	}
 }
-

From a0851fb96f09a12bb1e484041943a7a1668ed8f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 084/115] 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 38bf2a0e8a0d7531054422bddcc2201c6c401583 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 085/115] 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 631f24f08095a1cbaf1d6f128e20b7803919cfae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 086/115] 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 c138ccb77df5c4b5a8237c106e4d575682a40dd8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 087/115] 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 dd8d6d065969b430bf6a919a9ce9a298d099da94 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 088/115] 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 0caf8df6d0f924a7ee16e9bae02d79d89f96a793 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 089/115] 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 088d163b08ba6a40bfd00f8be1b227b161423206 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 090/115] 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"

From 3d676fa0c3b22d1b283497fac91ec17451f07a7e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 091/115] 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 b23cef958c2b72f1d388c4c52a723ee52455efad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 092/115] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 2360d6b12933dd67b27515fab3f3f2e63346c261 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 093/115] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 1827b5405326448a2ce922a75805a734d8184a40 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 094/115] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 6b75f51271dc5a8bb7a747ab4b6ee18a89026e6f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 095/115] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 38f7e2f1fef39dfce7cf08cc9613bb9e52c60f1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 096/115] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..c088c6f11478 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -9,6 +9,7 @@ hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
 depends="python3-gobject hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From 5faeead7ab6edc12df28a3738ede2faac51148ec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 097/115] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 1510a488207f3683e10c858959eb07d9e6d3fbb0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 098/115] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 4eef223b9e7b47178eabda935f654b9022fa7761 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 099/115] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From 192666427aa19a285916ae6ee2313a84733de708 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 100/115] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 419844466a791b26ed868dd1d5dc0654698f0818 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 101/115] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 2d52f6f72877cf3306856951bbdf502c64cdfa63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 102/115] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   1 +
 5 files changed, 386 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 542e59df3add..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -15,6 +15,7 @@ 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=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From df567be0d6dd4debc370627afe34dadd0de34dbe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 103/115] 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..2d7804c5c319 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>=3.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 e993e28c46c933de248ef46ceb5ebf2407d17b48 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 104/115] 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 2d7804c5c319..fedf6b594530 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 481243de4fa80855f1791f487e1d54fe6666dacd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 105/115] 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..06b3ad30d0e0 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>=3.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>=40.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 7557ce3b5d18b1bde0e25d44c4b6f87825d19c25 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 106/115] 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 06b3ad30d0e0..decc3bfd2bfa 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 3ba7e3721ba29e3ddaf00c1e166ad4ace3b34904 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 107/115] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 32f05832bd9a2fc1a8c12694383614c069e110c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 108/115] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..0efd15dec63b 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
 python_version=2 #unverified
 lib32disabled=yes

From e233acb769b6b7be97c16f88378dea1c93eca7de Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 7 Apr 2021 09:52:00 +0200
Subject: [PATCH 109/115] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index f292438ad31f..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
-revision=2
+version=2.6.9
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From 27caa636531641fcb39b971283c286deba2274c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:02:58 +0200
Subject: [PATCH 110/115] gnome-books: tracker-devel is no longer needed

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index bcb27e87c8ed..feb752614ace 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -6,7 +6,7 @@ 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
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
  gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From c8eae32f65c9c611330a5b5c3a60b7e961850da2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:05:32 +0200
Subject: [PATCH 111/115] gnome-boxes: depend on tracker3 instead of tracker

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index 06c2804b6870..af6d13eb4fc2 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -8,9 +8,9 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
  libhandy1-devel tracker3-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"

From bb7b8ddf9a1e5a0208e64ad357d90153f2946202 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 112/115] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..4739891c8ff2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
@@ -17,5 +17,13 @@ homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
+
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

From 26c30f7506e40ab2b57a32acfd574f2d1fdcd477 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:38:40 +0200
Subject: [PATCH 113/115] verify python version, add missing dependency

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 0efd15dec63b..694564da7121 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -8,12 +8,12 @@ hostmakedepends="glib-devel pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-depends="eog gsettings-desktop-schemas"
+depends="eog gsettings-desktop-schemas python3-gobject"
 short_desc="Eye of GNOME plugins"
 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=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
-python_version=2 #unverified
+python_version=3
 lib32disabled=yes

From e606f76bb4da6254b7123af2a9cea989fdeab686 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:10 +0200
Subject: [PATCH 114/115] giggle: doesn't need vte290.

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

diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 1984fed3f638..8240dd9afcd1 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config itstool intltool glib-devel git
  automake gettext-devel libtool tar yelp-tools"
-makedepends="gtksourceview-devel vte290-devel"
+makedepends="gtksourceview-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bb13b5cdd72637a46f250b3e4144a43473865c20 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:56 +0200
Subject: [PATCH 115/115] gnome-boxes: clean up dependencies

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index af6d13eb4fc2..86f01ea8432f 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -8,8 +8,8 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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
- vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy1-devel tracker3-devel"
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
+ tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (95 preceding siblings ...)
  2021-04-08 10:58 ` Gottox
@ 2021-04-08 10:59 ` Gottox
  2021-04-08 11:04 ` FollieHiyuki
                   ` (16 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08 10:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 180307 bytes --]

From a16f3de2e98815f41d46ef70f0360db595f5a2d6 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 001/116] 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 f875d101a2deefe2e6811a8424135571489bfce1 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 002/116] 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 91e375db0dae7367202013ee7b9240d3d18a4105 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 003/116] 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..450d393b09c0 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="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From dfac560ed4f602c681631849574659233dc905ba 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 004/116] 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 c71deac44403cce7a9c964eb8c1b580fd352e331 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 005/116] 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 e16948fb688d9a2055a3dc3244690c391da91182 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 006/116] 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 5df6e60d4d1f5752d63cd75a75b26f3412b0e4e5 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 007/116] 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 30ec6e918e0c6c3d5b66c0048b84ff8f98409910 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 008/116] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 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)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="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 60ae230c7f3a8ad0f9a0adf5eb419b45402f563a 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 009/116] 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 29d58adbcc59a3bcc255c30fc0493f72ae9030dd 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 010/116] 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 70be7e00c51d..99fdf5b6d15f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2923,15 +2923,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 9d6d5d78c814e7c6386bbefeadefb593d2069491 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/116] 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 b5fa3ff3357654044618c6aff781fa2067b48520 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/116] 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 cb638616cc9b4ab60d5fbd827d2b12189ab22451 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/116] 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 5fd6a6b64ddfef61e47d8b24fcda9d146a97b9be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/116] 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 e76043e8082317503f0c9957f0f3f4e1a7d36fff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/116] 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 ffeac5aae068b3b162b1ef8dcf927bdf2e88c9d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/116] 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 ade2921e759faa407906cb3d265d5686b5ebf982 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/116] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 99fdf5b6d15f..fe53085481df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 39733678a902f3613ee60b0cda1afcd1fd9ede65 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/116] 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 3b400f124aea2f5e4b8be3f2c0b9171f357bf011 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/116] 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 8f70dc10d735df4287172ae3500afdbf48fe640d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/116] 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 2020a561764f9a0caae2aed408ff7e3e16f2556b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/116] 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 fe53085481df..c811001868a7 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 2bd25f716da8befc19fa7e47a3454bf410580716 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/116] 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 c811001868a7..0e3386130501 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 c08bf9d0cf6b6454e0131d83030e65aa0aac2373 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/116] 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 adfba3e1209b50f15a6f87afd228f1d5fcba5988 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/116] 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 466cb1214e3c6f2e00809aaf1055de1721fcfce7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/116] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..851af74f1da4 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
@@ -9,12 +9,17 @@ configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
 depends="gir-freedesktop python3-cairo"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From fefa4719d989029ce4e02745f35a5bc672b4df4f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 026/116] 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 9a8a2e81437605f94228c741c6118fd7d7034097 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 027/116] 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 e4d3bb5835071cb4bb536967a5623772a588340f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 028/116] 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 f86de0c8426c1fa66d773caba24c9ebda4a5e592 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 029/116] 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 9a3e6a6e311d110baec6abd329103a2c7f3d8cab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 030/116] 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 d04cad531ec8d22a7ae6d6e8d9ad19fd3d96d2eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 031/116] 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 a570f071893c613663ee2882be7cd24b00299c39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 032/116] 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 bfdf843efeb8d3d5e9b8cdd46587f8cb65781d30 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 033/116] 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 e10ce9151edd6deb584af5f721f87f1c95e5df9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 034/116] 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 7993532e5cc20d45faf727f3ecb4269d6a3e8f90 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 035/116] 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 a02eb79448a0ba5785b54717bbb5ceb20090aacf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 036/116] 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 92a96e1708f3d5fa595fec3fab9a0971dca4c13e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 037/116] 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 c66cfeb84c5a17c09890d1cc848cd56f68c589c8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 038/116] 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 ac781f701b7ab68fd373708739df5d6d1f597aa9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 039/116] 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 d2a66945eca386bce3b011fb472265166cee3a91 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 040/116] 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 0d67238ea99ab550cf3c6be63f212769ea521304 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 041/116] 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 05045810b081ff50937fa2fb85ee2b255927c4f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 042/116] 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 7d63cfeb07545103410498f85b321168ce0deb48 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 043/116] 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 915af7f0fd8320fd3699513912e06dc868098a54 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 044/116] 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 4551655e3aba1f28ac8e35a17d8cfb2bf0f7d148 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 045/116] 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 58575ab921f26fe140818ab556c861347cac45f2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 046/116] 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 7883f3526d0b73a3d05b862de59e7ff7c9cd0286 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 047/116] 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 a3ea176e6704a6f8bb216237d157904d67b48b29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 048/116] 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 0e3386130501..c9f12b534d07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3452,7 +3452,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 94c1ccf176509b3a49c6f023757a62ef2290f9c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 049/116] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index c9f12b534d07..47739516eb7f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3571,7 +3571,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From a7bd9a6334110940e1f07d2ae84d9526365bf57a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 050/116] 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 48779b63b610d45a22508c2cd8976b474aeb8c7e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 051/116] 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 7bbc9cf612cb8a475ca34e38c5c6c454cbaf8f63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 052/116] 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 4bb849f8ce9aceb2bb38d19281bde2c0581186fe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 053/116] 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 57ae532e5b2ae41d70488765f2221cc51a58be73 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 054/116] 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 ba7efbcbdf71fdf63fe2d6d4039f30f508b6a499 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 055/116] 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 c977c5a2e70f94cf904b9334dc64b05ca149e96e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 056/116] 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 9ffc0131b8d537f960fb668230c6dcce034419a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 057/116] 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 e6f95b28b00d23b920c96795fcd7fa1d9a007ad9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 058/116] 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 045df4d6bbb2e45385bdd88315dbde61a2ba1cdf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 059/116] 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 ad4e8b81c4a0501265e0e3d831d9d40900de5e1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 060/116] 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 fa6b37f7c111ccac7df3334cbd7b9fde85b6f705 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 061/116] 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 07b73fee6d98cf02710d2f9abb18610b8065c249 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 062/116] 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 829b3ab1150408ae8c0e2d8a612629ff74f2a2ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 063/116] 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 d57e44c0ac8941c65a7af30650eaa4e1f49a54ac Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 064/116] 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 836c52f405745e0e69fc9157043e1d3c9aea66ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 065/116] 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 6b0e99c1590b69da1084b97ed4ee943c97843954 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 066/116] 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 f3067f714d5de7738c019eb89f173d89fa7cd922 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 067/116] 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 439c6d92392f2d6dc676b5180886128b25ec3f5e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 068/116] 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 9c1ad409c58a52b662e2d7e31cd44e1a8fe1b105 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 069/116] 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 20a39f61cf1453a55cf436784e43b2efa03834ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 070/116] 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 5a5f30433658723c43e578b7e4b745f2632c0b9a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 071/116] 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 4b0e454ef5724d317c0db3361b9b2065f6000711 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 072/116] 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 c46ee35edc44b033367a5c2f3ef6d62f7473441d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 073/116] 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 9c21e8aa92a332bd3fff0ddce4c246759e425a84 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 074/116] 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 bcb078ebd991f9d7833527ac9a42a0d488bfa933 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 075/116] 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 f9f11572c5a6429a69e3988ad3e1f2a524acc28e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 076/116] 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 602d37c02f581602367eab45a4c4d651262f5698 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 077/116] 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 cc7eae465183a995e52b53f7637a466cb3e55e46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 078/116] 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 3e82968c64abd8e4b324cbbea38894431a1b6b5e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 079/116] 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 c34e0ffd21957327a3dfc7226268a229309c6793 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 080/116] 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 383b04fc1dfff8624d30a3caa567dc8b3aa44cd2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 081/116] 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 f5ba065132bcabecabe8c17f87d94e84a8ab07d9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 082/116] 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 26255df0e966492ab591b603536d8c5ad03b9750 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 083/116] jsonrpc-glib: update to 3.38.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..b17223455261 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"
@@ -34,4 +34,3 @@ jsonrpc-glib-devel_package() {
 		fi
 	}
 }
-

From a0851fb96f09a12bb1e484041943a7a1668ed8f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 084/116] 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 38bf2a0e8a0d7531054422bddcc2201c6c401583 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 085/116] 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 631f24f08095a1cbaf1d6f128e20b7803919cfae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 086/116] 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 c138ccb77df5c4b5a8237c106e4d575682a40dd8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 087/116] 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 dd8d6d065969b430bf6a919a9ce9a298d099da94 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 088/116] 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 0caf8df6d0f924a7ee16e9bae02d79d89f96a793 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 089/116] 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 088d163b08ba6a40bfd00f8be1b227b161423206 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 090/116] 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"

From 3d676fa0c3b22d1b283497fac91ec17451f07a7e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 091/116] 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 b23cef958c2b72f1d388c4c52a723ee52455efad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 092/116] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 2360d6b12933dd67b27515fab3f3f2e63346c261 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 093/116] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 1827b5405326448a2ce922a75805a734d8184a40 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 094/116] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 6b75f51271dc5a8bb7a747ab4b6ee18a89026e6f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 095/116] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 38f7e2f1fef39dfce7cf08cc9613bb9e52c60f1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 096/116] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..c088c6f11478 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -9,6 +9,7 @@ hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
 depends="python3-gobject hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From 5faeead7ab6edc12df28a3738ede2faac51148ec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 097/116] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 1510a488207f3683e10c858959eb07d9e6d3fbb0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 098/116] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 4eef223b9e7b47178eabda935f654b9022fa7761 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 099/116] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From 192666427aa19a285916ae6ee2313a84733de708 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 100/116] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 419844466a791b26ed868dd1d5dc0654698f0818 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 101/116] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 2d52f6f72877cf3306856951bbdf502c64cdfa63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 102/116] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   1 +
 5 files changed, 386 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 542e59df3add..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -15,6 +15,7 @@ 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=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From df567be0d6dd4debc370627afe34dadd0de34dbe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 103/116] 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..2d7804c5c319 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>=3.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 e993e28c46c933de248ef46ceb5ebf2407d17b48 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 104/116] 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 2d7804c5c319..fedf6b594530 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 481243de4fa80855f1791f487e1d54fe6666dacd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 105/116] 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..06b3ad30d0e0 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>=3.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>=40.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 7557ce3b5d18b1bde0e25d44c4b6f87825d19c25 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 106/116] 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 06b3ad30d0e0..decc3bfd2bfa 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 3ba7e3721ba29e3ddaf00c1e166ad4ace3b34904 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 107/116] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 32f05832bd9a2fc1a8c12694383614c069e110c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 108/116] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..0efd15dec63b 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
 python_version=2 #unverified
 lib32disabled=yes

From e233acb769b6b7be97c16f88378dea1c93eca7de Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 7 Apr 2021 09:52:00 +0200
Subject: [PATCH 109/116] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index f292438ad31f..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
-revision=2
+version=2.6.9
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From 27caa636531641fcb39b971283c286deba2274c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:02:58 +0200
Subject: [PATCH 110/116] gnome-books: tracker-devel is no longer needed

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index bcb27e87c8ed..feb752614ace 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -6,7 +6,7 @@ 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
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
  gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From c8eae32f65c9c611330a5b5c3a60b7e961850da2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:05:32 +0200
Subject: [PATCH 111/116] gnome-boxes: depend on tracker3 instead of tracker

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index 06c2804b6870..af6d13eb4fc2 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -8,9 +8,9 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
  libhandy1-devel tracker3-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"

From bb7b8ddf9a1e5a0208e64ad357d90153f2946202 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 112/116] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..4739891c8ff2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
@@ -17,5 +17,13 @@ homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
+
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

From 26c30f7506e40ab2b57a32acfd574f2d1fdcd477 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:38:40 +0200
Subject: [PATCH 113/116] verify python version, add missing dependency

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 0efd15dec63b..694564da7121 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -8,12 +8,12 @@ hostmakedepends="glib-devel pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-depends="eog gsettings-desktop-schemas"
+depends="eog gsettings-desktop-schemas python3-gobject"
 short_desc="Eye of GNOME plugins"
 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=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
-python_version=2 #unverified
+python_version=3
 lib32disabled=yes

From e606f76bb4da6254b7123af2a9cea989fdeab686 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:10 +0200
Subject: [PATCH 114/116] giggle: doesn't need vte290.

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

diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 1984fed3f638..8240dd9afcd1 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config itstool intltool glib-devel git
  automake gettext-devel libtool tar yelp-tools"
-makedepends="gtksourceview-devel vte290-devel"
+makedepends="gtksourceview-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bb13b5cdd72637a46f250b3e4144a43473865c20 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:56 +0200
Subject: [PATCH 115/116] gnome-boxes: clean up dependencies

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index af6d13eb4fc2..86f01ea8432f 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -8,8 +8,8 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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
- vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy1-devel tracker3-devel"
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
+ tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From d0ec9f8d722d880820349d180509c0387b891525 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:59:09 +0200
Subject: [PATCH 116/116] ibus: update to 1.5.24.

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

diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index d939b42ca609..2729465a5938 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus'
 pkgname=ibus
-version=1.5.23
+version=1.5.24
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/ibus/ibus"
 distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
-checksum=b7e8d5bdb7d71a5ba4ee43cdf374675f77121a71c1679c9b9e7e02875bd0e150
+checksum=abf33a965063629d3bbdab8a5948736ce3a9523cc3d6331e5ea0ec5e8ea7421f
 
 build_options="ibus_setup dicts"
 desc_option_ibus_setup="Enable support for building the ibus setup UI"

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (96 preceding siblings ...)
  2021-04-08 10:59 ` Gottox
@ 2021-04-08 11:04 ` FollieHiyuki
  2021-04-08 11:07 ` Gottox
                   ` (15 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: FollieHiyuki @ 2021-04-08 11:04 UTC (permalink / raw)
  To: ml

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

New comment by FollieHiyuki on void-packages repository

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

Comment:
@Gottox can you take the change from #29025 into this as well and see if it works?

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (97 preceding siblings ...)
  2021-04-08 11:04 ` FollieHiyuki
@ 2021-04-08 11:07 ` Gottox
  2021-04-08 11:07 ` [PR PATCH] [Updated] " Gottox
                   ` (14 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08 11:07 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
> @Gottox can you take the change from #29025 into this as well and see if it works?

Let me remove this commit. It makes more sense to update it independant of gnome.

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (98 preceding siblings ...)
  2021-04-08 11:07 ` Gottox
@ 2021-04-08 11:07 ` Gottox
  2021-04-08 17:34 ` ericonr
                   ` (13 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08 11:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 179232 bytes --]

From a16f3de2e98815f41d46ef70f0360db595f5a2d6 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 001/115] 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 f875d101a2deefe2e6811a8424135571489bfce1 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 002/115] 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 91e375db0dae7367202013ee7b9240d3d18a4105 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 003/115] 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..450d393b09c0 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="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From dfac560ed4f602c681631849574659233dc905ba 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 004/115] 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 c71deac44403cce7a9c964eb8c1b580fd352e331 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 005/115] 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 e16948fb688d9a2055a3dc3244690c391da91182 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 006/115] 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 5df6e60d4d1f5752d63cd75a75b26f3412b0e4e5 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 007/115] 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 30ec6e918e0c6c3d5b66c0048b84ff8f98409910 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 008/115] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 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)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="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 60ae230c7f3a8ad0f9a0adf5eb419b45402f563a 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 009/115] 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 29d58adbcc59a3bcc255c30fc0493f72ae9030dd 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 010/115] 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 70be7e00c51d..99fdf5b6d15f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2923,15 +2923,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 9d6d5d78c814e7c6386bbefeadefb593d2069491 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 011/115] 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 b5fa3ff3357654044618c6aff781fa2067b48520 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 012/115] 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 cb638616cc9b4ab60d5fbd827d2b12189ab22451 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 013/115] 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 5fd6a6b64ddfef61e47d8b24fcda9d146a97b9be Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 014/115] 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 e76043e8082317503f0c9957f0f3f4e1a7d36fff Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 015/115] 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 ffeac5aae068b3b162b1ef8dcf927bdf2e88c9d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 016/115] 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 ade2921e759faa407906cb3d265d5686b5ebf982 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 017/115] glib: update to 2.68.0.

---
 common/shlibs                                   | 10 +++++-----
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++---
 srcpkgs/glib/template                           |  6 +++---
 srcpkgs/glib/update                             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 99fdf5b6d15f..fe53085481df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..1bf1582384ac 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..7bf01bb46 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 39733678a902f3613ee60b0cda1afcd1fd9ede65 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 018/115] 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 3b400f124aea2f5e4b8be3f2c0b9171f357bf011 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 019/115] 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 8f70dc10d735df4287172ae3500afdbf48fe640d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 020/115] 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 2020a561764f9a0caae2aed408ff7e3e16f2556b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 021/115] 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 fe53085481df..c811001868a7 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 2bd25f716da8befc19fa7e47a3454bf410580716 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 022/115] 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 c811001868a7..0e3386130501 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 c08bf9d0cf6b6454e0131d83030e65aa0aac2373 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 023/115] 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 adfba3e1209b50f15a6f87afd228f1d5fcba5988 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 024/115] 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 466cb1214e3c6f2e00809aaf1055de1721fcfce7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 025/115] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..851af74f1da4 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
@@ -9,12 +9,17 @@ configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
 depends="gir-freedesktop python3-cairo"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From fefa4719d989029ce4e02745f35a5bc672b4df4f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 026/115] 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 9a8a2e81437605f94228c741c6118fd7d7034097 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 027/115] 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 e4d3bb5835071cb4bb536967a5623772a588340f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 028/115] 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 f86de0c8426c1fa66d773caba24c9ebda4a5e592 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:47:46 +0200
Subject: [PATCH 029/115] 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 9a3e6a6e311d110baec6abd329103a2c7f3d8cab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 030/115] 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 d04cad531ec8d22a7ae6d6e8d9ad19fd3d96d2eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 031/115] 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 a570f071893c613663ee2882be7cd24b00299c39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 032/115] 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 bfdf843efeb8d3d5e9b8cdd46587f8cb65781d30 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 033/115] 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 e10ce9151edd6deb584af5f721f87f1c95e5df9f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 034/115] 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 7993532e5cc20d45faf727f3ecb4269d6a3e8f90 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 035/115] 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 a02eb79448a0ba5785b54717bbb5ceb20090aacf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 036/115] 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 92a96e1708f3d5fa595fec3fab9a0971dca4c13e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 037/115] 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 c66cfeb84c5a17c09890d1cc848cd56f68c589c8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 038/115] 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 ac781f701b7ab68fd373708739df5d6d1f597aa9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 039/115] 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 d2a66945eca386bce3b011fb472265166cee3a91 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 040/115] 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 0d67238ea99ab550cf3c6be63f212769ea521304 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 041/115] 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 05045810b081ff50937fa2fb85ee2b255927c4f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 042/115] 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 7d63cfeb07545103410498f85b321168ce0deb48 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 043/115] 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 915af7f0fd8320fd3699513912e06dc868098a54 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 044/115] 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 4551655e3aba1f28ac8e35a17d8cfb2bf0f7d148 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 045/115] 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 58575ab921f26fe140818ab556c861347cac45f2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 046/115] 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 7883f3526d0b73a3d05b862de59e7ff7c9cd0286 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 047/115] 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 a3ea176e6704a6f8bb216237d157904d67b48b29 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 048/115] 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 0e3386130501..c9f12b534d07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3452,7 +3452,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 94c1ccf176509b3a49c6f023757a62ef2290f9c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 049/115] gedit: update to 40.0.

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

diff --git a/common/shlibs b/common/shlibs
index c9f12b534d07..47739516eb7f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3571,7 +3571,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From a7bd9a6334110940e1f07d2ae84d9526365bf57a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 050/115] 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 48779b63b610d45a22508c2cd8976b474aeb8c7e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 051/115] 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 7bbc9cf612cb8a475ca34e38c5c6c454cbaf8f63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 052/115] 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 4bb849f8ce9aceb2bb38d19281bde2c0581186fe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 053/115] 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 57ae532e5b2ae41d70488765f2221cc51a58be73 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 054/115] 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 ba7efbcbdf71fdf63fe2d6d4039f30f508b6a499 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 055/115] 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 c977c5a2e70f94cf904b9334dc64b05ca149e96e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 056/115] 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 9ffc0131b8d537f960fb668230c6dcce034419a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 057/115] 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 e6f95b28b00d23b920c96795fcd7fa1d9a007ad9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 058/115] 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 045df4d6bbb2e45385bdd88315dbde61a2ba1cdf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 059/115] 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 ad4e8b81c4a0501265e0e3d831d9d40900de5e1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 060/115] 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 fa6b37f7c111ccac7df3334cbd7b9fde85b6f705 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 061/115] 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 07b73fee6d98cf02710d2f9abb18610b8065c249 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 062/115] 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 829b3ab1150408ae8c0e2d8a612629ff74f2a2ce Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 063/115] 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 d57e44c0ac8941c65a7af30650eaa4e1f49a54ac Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 064/115] 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 836c52f405745e0e69fc9157043e1d3c9aea66ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 065/115] 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 6b0e99c1590b69da1084b97ed4ee943c97843954 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 066/115] 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 f3067f714d5de7738c019eb89f173d89fa7cd922 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 067/115] 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 439c6d92392f2d6dc676b5180886128b25ec3f5e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 068/115] 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 9c1ad409c58a52b662e2d7e31cd44e1a8fe1b105 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 069/115] 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 20a39f61cf1453a55cf436784e43b2efa03834ea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 070/115] 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 5a5f30433658723c43e578b7e4b745f2632c0b9a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 071/115] 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 4b0e454ef5724d317c0db3361b9b2065f6000711 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 072/115] 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 c46ee35edc44b033367a5c2f3ef6d62f7473441d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 073/115] 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 9c21e8aa92a332bd3fff0ddce4c246759e425a84 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 074/115] 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 bcb078ebd991f9d7833527ac9a42a0d488bfa933 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 075/115] 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 f9f11572c5a6429a69e3988ad3e1f2a524acc28e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:55:50 +0200
Subject: [PATCH 076/115] 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 602d37c02f581602367eab45a4c4d651262f5698 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:00:17 +0200
Subject: [PATCH 077/115] 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 cc7eae465183a995e52b53f7637a466cb3e55e46 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 078/115] 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 3e82968c64abd8e4b324cbbea38894431a1b6b5e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 079/115] 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 c34e0ffd21957327a3dfc7226268a229309c6793 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 080/115] 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 383b04fc1dfff8624d30a3caa567dc8b3aa44cd2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 081/115] 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 f5ba065132bcabecabe8c17f87d94e84a8ab07d9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 082/115] 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 26255df0e966492ab591b603536d8c5ad03b9750 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 083/115] jsonrpc-glib: update to 3.38.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..b17223455261 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"
@@ -34,4 +34,3 @@ jsonrpc-glib-devel_package() {
 		fi
 	}
 }
-

From a0851fb96f09a12bb1e484041943a7a1668ed8f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 084/115] 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 38bf2a0e8a0d7531054422bddcc2201c6c401583 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 085/115] 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 631f24f08095a1cbaf1d6f128e20b7803919cfae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 086/115] 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 c138ccb77df5c4b5a8237c106e4d575682a40dd8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 087/115] 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 dd8d6d065969b430bf6a919a9ce9a298d099da94 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 088/115] 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 0caf8df6d0f924a7ee16e9bae02d79d89f96a793 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 089/115] 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 088d163b08ba6a40bfd00f8be1b227b161423206 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 090/115] 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"

From 3d676fa0c3b22d1b283497fac91ec17451f07a7e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 091/115] 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 b23cef958c2b72f1d388c4c52a723ee52455efad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 092/115] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 2360d6b12933dd67b27515fab3f3f2e63346c261 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 093/115] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 1827b5405326448a2ce922a75805a734d8184a40 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 11:50:20 +0200
Subject: [PATCH 094/115] gspell: fix tests

---
 srcpkgs/gspell/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ea7f4862b113..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 6b75f51271dc5a8bb7a747ab4b6ee18a89026e6f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:00:05 +0200
Subject: [PATCH 095/115] dconf: fix tests

---
 srcpkgs/dconf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index b79822642fc3..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -6,6 +6,7 @@ build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 38f7e2f1fef39dfce7cf08cc9613bb9e52c60f1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 12:11:00 +0200
Subject: [PATCH 096/115] libpeas: fix tests

---
 srcpkgs/libpeas/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a63e33fc5111..c088c6f11478 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -9,6 +9,7 @@ hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
 depends="python3-gobject hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
 
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
+
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel
 	 ${sourcepkg}-${version}_${revision}"

From 5faeead7ab6edc12df28a3738ede2faac51148ec Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 13:31:35 +0200
Subject: [PATCH 097/115] gnome-bluetooth: fix tests

---
 srcpkgs/gnome-bluetooth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 80689df392fd..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 1510a488207f3683e10c858959eb07d9e6d3fbb0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 17:19:20 +0200
Subject: [PATCH 098/115] glib: disable broken tests on musl

---
 .../glib/patches/disable-broken-tests.patch   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 1bf1582384ac..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index c77ccdd14..7bf01bb46 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},

From 4eef223b9e7b47178eabda935f654b9022fa7761 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 17:09:53 +0200
Subject: [PATCH 099/115] gobject-introspection: fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index b853759a9583..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -19,7 +19,7 @@ patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From 192666427aa19a285916ae6ee2313a84733de708 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Apr 2021 19:21:32 +0200
Subject: [PATCH 100/115] libvirt-glib: make gtk doc a build_option to fix
 cross. Default is off

---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 12 +++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index b91c6119892e..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -5,9 +5,9 @@ revision=1
 build_helper="gir"
 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)"
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 419844466a791b26ed868dd1d5dc0654698f0818 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:48:04 +0200
Subject: [PATCH 101/115] glib: add backport fix.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+

From 2d52f6f72877cf3306856951bbdf502c64cdfa63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 09:50:42 +0200
Subject: [PATCH 102/115] gjs: import Fedora patches

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   1 +
 5 files changed, 386 insertions(+)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 542e59df3add..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -15,6 +15,7 @@ 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=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From df567be0d6dd4debc370627afe34dadd0de34dbe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 103/115] 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..2d7804c5c319 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>=3.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 e993e28c46c933de248ef46ceb5ebf2407d17b48 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:04 +0200
Subject: [PATCH 104/115] 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 2d7804c5c319..fedf6b594530 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 481243de4fa80855f1791f487e1d54fe6666dacd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 105/115] 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..06b3ad30d0e0 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>=3.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>=40.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 7557ce3b5d18b1bde0e25d44c4b6f87825d19c25 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:36:12 +0200
Subject: [PATCH 106/115] 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 06b3ad30d0e0..decc3bfd2bfa 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 3ba7e3721ba29e3ddaf00c1e166ad4ace3b34904 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:26 +0200
Subject: [PATCH 107/115] gnome: add gnote

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index decc3bfd2bfa..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -70,6 +70,7 @@ _apps_depends="
  gnome-system-monitor>=40.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 32f05832bd9a2fc1a8c12694383614c069e110c7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 108/115] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..0efd15dec63b 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
 python_version=2 #unverified
 lib32disabled=yes

From e233acb769b6b7be97c16f88378dea1c93eca7de Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 7 Apr 2021 09:52:00 +0200
Subject: [PATCH 109/115] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index f292438ad31f..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
-revision=2
+version=2.6.9
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From 27caa636531641fcb39b971283c286deba2274c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:02:58 +0200
Subject: [PATCH 110/115] gnome-books: tracker-devel is no longer needed

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index bcb27e87c8ed..feb752614ace 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -6,7 +6,7 @@ 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
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
  gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From c8eae32f65c9c611330a5b5c3a60b7e961850da2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:05:32 +0200
Subject: [PATCH 111/115] gnome-boxes: depend on tracker3 instead of tracker

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index 06c2804b6870..af6d13eb4fc2 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -8,9 +8,9 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
  libhandy1-devel tracker3-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"

From bb7b8ddf9a1e5a0208e64ad357d90153f2946202 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 112/115] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..4739891c8ff2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
@@ -17,5 +17,13 @@ homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
+
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

From 26c30f7506e40ab2b57a32acfd574f2d1fdcd477 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:38:40 +0200
Subject: [PATCH 113/115] verify python version, add missing dependency

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 0efd15dec63b..694564da7121 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -8,12 +8,12 @@ hostmakedepends="glib-devel pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-depends="eog gsettings-desktop-schemas"
+depends="eog gsettings-desktop-schemas python3-gobject"
 short_desc="Eye of GNOME plugins"
 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=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
-python_version=2 #unverified
+python_version=3
 lib32disabled=yes

From e606f76bb4da6254b7123af2a9cea989fdeab686 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:10 +0200
Subject: [PATCH 114/115] giggle: doesn't need vte290.

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

diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 1984fed3f638..8240dd9afcd1 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config itstool intltool glib-devel git
  automake gettext-devel libtool tar yelp-tools"
-makedepends="gtksourceview-devel vte290-devel"
+makedepends="gtksourceview-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bb13b5cdd72637a46f250b3e4144a43473865c20 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:56 +0200
Subject: [PATCH 115/115] gnome-boxes: clean up dependencies

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index af6d13eb4fc2..86f01ea8432f 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -8,8 +8,8 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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
- vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy1-devel tracker3-devel"
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
+ tracker3-devel"
 depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (99 preceding siblings ...)
  2021-04-08 11:07 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-08 17:34 ` ericonr
  2021-04-08 18:15 ` [PR PATCH] [Updated] " Gottox
                   ` (12 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: ericonr @ 2021-04-08 17:34 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

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

Comment:
```
=> mutter-40.0_1: fetching distfile 'mutter-40.0.tar.xz'...
https://download.gnome.org/sources/mutter/40.0/mutter-40.0.tar.xz: Not Found
```

Doesn't seem to be due to load limiting, I can't access it locally either.

There are some packages with up to 3 commits, might be nice to squash them together...

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (100 preceding siblings ...)
  2021-04-08 17:34 ` ericonr
@ 2021-04-08 18:15 ` Gottox
  2021-04-08 18:16 ` Gottox
                   ` (11 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08 18:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 161266 bytes --]

From a16f3de2e98815f41d46ef70f0360db595f5a2d6 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/95] 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 f875d101a2deefe2e6811a8424135571489bfce1 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/95] 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 91e375db0dae7367202013ee7b9240d3d18a4105 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/95] 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..450d393b09c0 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="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 2d8e6bb8585b6d56327a5c997ac8f733b8a14664 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/95] 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 6ad443a060dad6eeb01b7bd309a83bc81fc8488c 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/95] 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 ad87ca38bedd2794e25b45190e0b3caf9eb85327 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/95] 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 9a771f67a696af8596dd403bafcd733e32f94ce1 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/95] 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 023e8656f3cb7a1970b576f62619d0307f58efdc 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/95] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 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)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="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 f359b71f6ad163d8282fa586016280f72c269967 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/95] 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 8006b46ba7279c3581cf91ef670f551a4e20dc37 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/95] mutter: update to 40.0

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

diff --git a/common/shlibs b/common/shlibs
index 70be7e00c51d..99fdf5b6d15f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2923,15 +2923,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..99bcd13e784f 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,9 @@ 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 +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 0d87d97904f15c60c24b6b5d429447693bc2b048 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/95] 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 12e43775387f7809bfece681db393ce5711845ff 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/95] 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 25e0a8efb437dd6680d3dee419610107e2a821e2 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/95] dconf: update to 0.40.0, fix tests.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,17 +1,18 @@
 # 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"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 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 04040a5c3e522a85bee842e4a19821bc9d94fcb7 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/95] 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 3e936196c52e8b5cc155c38c346ad9ef6a3cfcbb 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/95] gobject-introspection: update to 1.68.0

also fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..c6e616dd862f 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,13 +13,13 @@ 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"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From dd285d6f06e0159aebb01771c3e338b2b75615d4 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/95] gjs: update to 1.68.0.

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   5 +-
 5 files changed, 388 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..db1396392446 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,8 @@ 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
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From 56b0b11ae8708e2451d6db263cf8b937bd84d47a 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/95] glib: update to 2.68.0.

* disable broken tests on musl

* add backport fix.
---
 common/shlibs                                 |  10 +-
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  28 +++-
 srcpkgs/glib/template                         |   6 +-
 srcpkgs/glib/update                           |   1 +
 5 files changed, 160 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 99fdf5b6d15f..fe53085481df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,21 +28,24 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -42,7 +53,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +61,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 5a88bb085e6d2ca6e1ab416767b8bb3bb92ceb5c 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/95] 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 4cc741d321eb7aaeb85a592c2585478be30fb0fd 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/95] 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 2fb1f1a7a533084148bd32e3c55f1e3c822ecc23 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/95] 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 fe96b53c8cab4acd1a5117043ec8109b8d885d60 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/95] 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 fe53085481df..c811001868a7 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 e77b382bfee8715e631849eef0188826916291ce 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/95] 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 c811001868a7..0e3386130501 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 aa9f4ef7ea9efb025e106cc5068644f65dd00f1f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 23/95] 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 b2a734f08d737b7d4789a0b22d9a6c7eeab5ecd3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 24/95] 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 b678bc62eda17d6fe8037fa0155800dc33d73851 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 25/95] 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 92655af28e0903a77bd29a7362edb2a46d468dee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 26/95] 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 435737667b6e35e0205ba49a7dd168854efa8231 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 27/95] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..851af74f1da4 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
@@ -9,12 +9,17 @@ configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
 depends="gir-freedesktop python3-cairo"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 5f3bc41041e4908892ee4e95f018030ac67d7067 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 28/95] 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 8c68b5c763c4e294b517e92fa5c0d322a89ea572 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 29/95] 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 a2433f05da2704a424467a8696dd644b5f3e48cb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 30/95] 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 3f3fb84a9a337343d8c347c45c31bd1afc27a81c 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/95] 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 8ac82a210fc1010cf15439c1a11de4997683f2aa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 32/95] 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 3849a3eb8b1db72a0989a78c8f1adf0fa7fb4720 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 33/95] 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 fb1f0e50925d6d17fc27a0632ca91446854cb905 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 34/95] 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 72bc88f42754c266d1e1321eda02900d01ebca55 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 35/95] 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 f8976bb1aa0677fbaab98c039b98ecba226595cf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 36/95] 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 04a5a09dc5fa29c65381c835c638309ef9bcc45e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 37/95] 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 c924c46424d6b8b31bca65907c446846d35c546e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 38/95] 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 e73265ec86eaeb4dd3973a08aa4968cea8638647 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 39/95] 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 d0f746d5b3018dde7a8b441e98473e364f8a7736 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 40/95] 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 168ba6f3d723d158130e8cbd4e77534b4c6cde72 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/95] 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 b08c6caebc3ceca17235f49929a50fc6114cd503 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 42/95] 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 070ba341be31d7289fc8f75703ed37fba46f742b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 43/95] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..694564da7121 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -8,12 +8,12 @@ hostmakedepends="glib-devel pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-depends="eog gsettings-desktop-schemas"
+depends="eog gsettings-desktop-schemas python3-gobject"
 short_desc="Eye of GNOME plugins"
 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=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
-python_version=2 #unverified
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
+python_version=3
 lib32disabled=yes

From b9d84e049b17c86a94821e9a963f5c9709cd5f66 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 44/95] 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 3c2746f617e797b11ccde831677bb20495744e34 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 45/95] 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 0e3386130501..c9f12b534d07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3452,7 +3452,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 708958d99b57314af2736fee6f80f4df64e3d731 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 46/95] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..4739891c8ff2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
@@ -17,5 +17,13 @@ homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
+
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

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

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

diff --git a/common/shlibs b/common/shlibs
index c9f12b534d07..47739516eb7f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3571,7 +3571,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From e990cf543a2eeb84f91f1c7fde6bb363f34a0298 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 48/95] 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 8cfcedd4ed5f428628e771900bc3c5b525418dd3 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/95] 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 5613ba7638b97333a36d58e46ac9bf1b25605e08 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/95] 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 46e121d1a7ca01e8228669ac6491995121c197bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 51/95] 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 519d5ceee531a42fbc139eeab6c48e98075aed0d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 52/95] 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 e6e6e201aa822601e699463fb77c70939b1a9493 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 53/95] 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 5c79ecc127e9bc049f4f6b7a0cd063e658bc72f6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 54/95] 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 8ebedae936a9619ba65eac03deed8ab13c8a07ae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 55/95] 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 3eb27182032b197d45a072875eb5098d2e2c261d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 56/95] 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 e4a7a64feee307070a104b8ef8e7970b145334ad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 57/95] 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 70577c9fefc13184ddab06974728bd3652adaf56 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 58/95] 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 23d7329ebf6dae63aed69feaa73cc45f85775db5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 59/95] 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 6b825735c26a87f956803898250742ff109ca712 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 60/95] 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 d791580839698cb7385977d67ce9bad747716c1e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 61/95] 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 e447de95897db89c568c9fc5d175eba0dcb4d850 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 62/95] 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 09c4bb5bd05a1ec1c64d11af7e270b3f9b77a0fc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 63/95] gspell: update to 1.8.4.

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..7c4228fd5757 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"
@@ -9,17 +9,22 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 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"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 8047b19a46281b1351a44dcbede3c24948cc93a7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 64/95] 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 481c4733e1e7aa21bd8bdb984e954858f26da04e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 65/95] 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 f24ceaf653d7a402c1dc069970093d1a22e39581 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 66/95] 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 65f420b9787401a392510f5fd425f386244708b6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 67/95] libvirt-glib: update to 4.0.0.

* make gtk doc a build_option to fix cross. Default is off.
---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 +++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 22 +++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,23 +1,23 @@
 # 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)"
-hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
- python-devel $(vopt_if vala vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 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"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From 3f7cc477aa00cb1d11d9746adbaa978bfca9327c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 68/95] 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 232488bdb827087c38d4e3682e5c0327f1627fb9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 69/95] 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 0c353f82d732a3cfb5efb385baafa5f390b1fcc2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 70/95] gnome-boxes: update to 40.0.

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..86f01ea8432f 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
@@ -8,13 +8,13 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
+ tracker3-devel"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 ed31e43cc7aa4e46938e5249470fc28ecbbf8744 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 71/95] 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 67a884790f5445b706d17bd7fcea2ae11aab3897 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 72/95] gnome-books: update to 40.0.

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index 1d4974fe1832..feb752614ace 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"
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-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 0d402b2699660419b3bee5be0b5c8df9b76e6058 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 73/95] gnome-bluetooth: update to 3.34.5.

* fix tests
---
 srcpkgs/gnome-bluetooth/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 9a9480ad0ab1..83d89c0a8acb 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
@@ -10,12 +10,13 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 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 43e44fee0f965f8f723d3632d97f2512308b324e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 74/95] 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 a5b65d0843bda957eb4e7b29890f4dd9780ca797 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 75/95] 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 d1f6cad1663e3bb977553ce525f448e663d7bbfd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 76/95] 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 1e0bd31944d12479662c43db811deea2f652816e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 77/95] 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 2c94df93c53bf8eccfba741f968d83d810c02de2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 78/95] 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 b02b14676d979f0f2bca2d717dc2e3fef9d14236 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 79/95] jsonrpc-glib: update to 3.38.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..b17223455261 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"
@@ -34,4 +34,3 @@ jsonrpc-glib-devel_package() {
 		fi
 	}
 }
-

From 63b47d0dd2b08747d1b5c9364aa5ed1ebecd00c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 80/95] 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 201bcf68c753a45b181990b62c83b78536ee1147 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 81/95] 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 cebce6f5548a192e11dbe68c7e1a72b1422b2d43 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 82/95] 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 035f42a66690463b97ccaff9245075516891a299 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 83/95] 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 b8171c38ca3925298d31ce190611ec2d3cf5f6ca Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 84/95] 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 208d17420f7d4c9913767eaacae2cdb9b2691f0c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 85/95] libpeas: update to 1.30.0.

* fix tests
---
 srcpkgs/libpeas/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index be9de4fd4c65..c088c6f11478 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"
@@ -9,12 +9,17 @@ hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
 depends="python3-gobject hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gobject-based plugins engine"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel

From d67ac98fa90e58d99209ad6a6494e1383c51c815 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 86/95] 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"

From 262fb506081f175524f3fd12c32bab22a453d7f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 87/95] 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 40de4f01f83d1520c769fdef0b56d0dce942d9f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 88/95] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 61bef10202307f8616445107c1c892cdc04e2a32 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 89/95] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From 2d3468f9eb384824d926341689236af378dae422 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 90/95] 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..fedf6b594530 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>=3.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.5
  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 d15697da7ad85e72f017fa5ec34f4fe127bfb71c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 91/95] gnome: update to 40.0.

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..40d177182045 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,71 @@ 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>=3.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-books>=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>=40.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
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

From bd4bc7b7ac63584d6f2a5ca0e692485aa3aff235 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 92/95] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
+version=2.6.9
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From 96755d11d7eddd804cdb42cdc194fb7af9c3402b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:10 +0200
Subject: [PATCH 93/95] giggle: doesn't need vte290.

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

diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 1984fed3f638..8240dd9afcd1 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config itstool intltool glib-devel git
  automake gettext-devel libtool tar yelp-tools"
-makedepends="gtksourceview-devel vte290-devel"
+makedepends="gtksourceview-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 193f3a91997f7fe79cb2160a6763029ab605e8d8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 94/95] 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 34004b239e7b9bb43d03456471e28911667c4b3e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 95/95] 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"

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (101 preceding siblings ...)
  2021-04-08 18:15 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-08 18:16 ` Gottox
  2021-04-08 18:17 ` Gottox
                   ` (10 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08 18:16 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
> ```
> => mutter-40.0_1: fetching distfile 'mutter-40.0.tar.xz'...
> https://download.gnome.org/sources/mutter/40.0/mutter-40.0.tar.xz: Not Found
> ```
> 
> Doesn't seem to be due to load limiting, I can't access it locally either.
It was a real issue. Fixed.

> There are some packages with up to 3 commits, might be nice to squash them together...
commits squashed.

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (102 preceding siblings ...)
  2021-04-08 18:16 ` Gottox
@ 2021-04-08 18:17 ` Gottox
  2021-04-09 16:52 ` [PR PATCH] [Updated] " Gottox
                   ` (9 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-08 18:17 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
> ```
> => mutter-40.0_1: fetching distfile 'mutter-40.0.tar.xz'...
> https://download.gnome.org/sources/mutter/40.0/mutter-40.0.tar.xz: Not Found
> ```
> 
> Doesn't seem to be due to load limiting, I can't access it locally either.

It was a real issue. Fixed.

> There are some packages with up to 3 commits, might be nice to squash them together...

commits squashed.

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

* Re: [PR PATCH] [Updated] Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (103 preceding siblings ...)
  2021-04-08 18:17 ` Gottox
@ 2021-04-09 16:52 ` Gottox
  2021-04-09 16:54 ` [PR PATCH] [Merged]: " Gottox
                   ` (8 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-09 16:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 938 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
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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: 161266 bytes --]

From d5f769ef0a20a30f061b4179c78127edf0099694 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/95] 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 c5980ef8be8f56dea7df76cfd128f712ae193d40 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/95] 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 28a31632495680d1b18d22ebb06bba03052205f3 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/95] 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..450d393b09c0 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="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 4cc2e9061a83ffea3abe21b2effac2b3b0be2e42 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/95] 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 b6a25b8799c160d3fecd627c7cc7a6a172e1af1c 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/95] 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 cb3da82639d026b7bf5b8c6e50f7ad1b8e239cd7 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/95] 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 c9ad8ab3cf2e137a71113c38285a65c647c662de 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/95] 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 3e04438591099bc17e8408fad7efa18747bc8dc6 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/95] libgweather: update to 40.0

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 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)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="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 a853f63cddf910886f8a2b32ea60f1e6bf63a531 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/95] 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 20fcf8238644ef26e01d963ebbb053c58f7a503d 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/95] mutter: update to 40.0

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

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..da280dfcefbd 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..99bcd13e784f 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,9 @@ 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 +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 62672a827be38a8639552281efa6d0540ddc7fd4 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/95] 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 b142b848b2357b56831eb3689bbd9a0ac9ebcee4 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/95] 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 2a77f3a073c63b42d8faee676f6e668dc3acb6e8 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/95] dconf: update to 0.40.0, fix tests.

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

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,17 +1,18 @@
 # 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"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 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 5967834b48e9960418dec302e0b85a56cf909d45 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/95] 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 03df84084becd1803daef79905ea3a38ea24fea4 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/95] gobject-introspection: update to 1.68.0

also fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..c6e616dd862f 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,13 +13,13 @@ 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"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From 97fabd59212a9ff6787d7dc039eedab0f0b7eaac 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/95] gjs: update to 1.68.0.

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   5 +-
 5 files changed, 388 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..db1396392446 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,8 @@ 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
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From 69c131c8992d398ec13109701a26b1fa659c007c 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/95] glib: update to 2.68.0.

* disable broken tests on musl

* add backport fix.
---
 common/shlibs                                 |  10 +-
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  28 +++-
 srcpkgs/glib/template                         |   6 +-
 srcpkgs/glib/update                           |   1 +
 5 files changed, 160 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index da280dfcefbd..59c4d07f72f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,21 +28,24 @@ index d8ebd56..be72f5c 100644
    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
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -42,7 +53,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +61,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 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;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From d17b49978aad508253032f965aa5003a7dd44f50 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/95] 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 82278158801ca2a02580e3d7605c23c64a94e008 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/95] 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 984e4c4fe5d0d01ca3de0d97112dd8943284ab89 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/95] 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 57df2f3a827b230ec71b7d33ca3f157b9512942a 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/95] 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 59c4d07f72f1..835ad9ee75d0 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 5dfaea0fd61969d920524d61dfe02ebedc2b7f3c 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/95] 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 835ad9ee75d0..5ef0f50876f5 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 4a50d43222aef2257970fb4d1563577747dc0bfb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 23/95] 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 bce983fe78bd28fe35493705735dc4566b85ea7e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 24/95] 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 f4601451e146b4dc40c64fe9637bbf296c4b4667 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 25/95] 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 14da8ed160605e90c366540cc7ef0e4c7e7ecd0a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 26/95] 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 7d71d1ed8943166f71902c8dfc80a320c930e4cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 27/95] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..851af74f1da4 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
@@ -9,12 +9,17 @@ configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
 depends="gir-freedesktop python3-cairo"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 short_desc="Python3 bindings for GObject"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From 78d658f98fd48f5677e91bec9e003f7d6622bb95 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 28/95] 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 7ab995e5fec79d237657a471e05de865921d0968 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 29/95] 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 5ed0eb47d191893f2ea2bd1dd1eb85d3e2ec44e5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 30/95] 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 acf9a3beacdd3adbfb4f6b1f9ec10bdf3bbbef3b 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/95] 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 317df31e96b79a9a82c0d2b843da01a6260a8a20 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 32/95] 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 9763cbe9750db995c1edeb40025a63926a4efc2b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 33/95] 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 b73d05ce2a48d3ce5fea3b8e9920bdfb2cc8320c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 34/95] 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 0a42b874f6da4d40df69295b35825e901613480d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 35/95] 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 7df392eb866d302bc50f993e344f10029c9977ee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 36/95] 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 4fd3399f969febb3223aa890d7de0ee15fe7367b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 37/95] 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 fe3b68c4d2db8d35c8ca551312820fb49aa025eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 38/95] 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 7a4ce4221d37dafbec167e2397a8260d995049c4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 39/95] 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 2ec38b808b30efc0b573f2affc611e45269af8bd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 40/95] 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 1c54687b454cd9b93225abbfc687c2da5bca3fe4 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/95] 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 75cc6a3b44fea5aa998fdb7d0ea7cdbcc9bd804c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 42/95] 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 0430a74d2ba39b8918af6b3d32f68987f928243a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 43/95] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..694564da7121 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -8,12 +8,12 @@ hostmakedepends="glib-devel pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-depends="eog gsettings-desktop-schemas"
+depends="eog gsettings-desktop-schemas python3-gobject"
 short_desc="Eye of GNOME plugins"
 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=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
-python_version=2 #unverified
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
+python_version=3
 lib32disabled=yes

From 25d6fe47e9e6b4b0609c5b2040a4eddb01c32b74 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 44/95] 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 3fb7b11316568a16a3b8aea5c1778b81254d4da3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 45/95] 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 5ef0f50876f5..6436cad085b3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3453,7 +3453,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 b5b43e25c8075e0712021937e09d856893a24694 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 46/95] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..4739891c8ff2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
@@ -17,5 +17,13 @@ homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
+
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

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

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

diff --git a/common/shlibs b/common/shlibs
index 6436cad085b3..8d3c87b4d34e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,7 +3572,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..8ec2ec020a9b 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,8 +17,8 @@ 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
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 97cf11756aa5aa9c6444d414595a02d2dabcd303 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 48/95] 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 1032620d4ec161a4314b77e1c77e91643d3285cf 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/95] 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 cce819a45508f84ed3b40be0700b18099d32904e 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/95] 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 9c2ccc849ab7c97b984938fdba6383593e5c549f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 51/95] 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 7291fd1615e98b7c3d41fbc23e3437b0c0e03ba9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 52/95] 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 fa72922d366404f276033caec58c41f5d12e4f19 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 53/95] 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 afd78b61739a5324f7837195f9355da4ef67c0b6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 54/95] 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 9b169341841f81cafbf766c1cf103e1e4a40a4df Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 55/95] 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 c186bb45000a27aafbfc1d94e3000c101344f529 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 56/95] 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 951477a64137302e1bd626df69ec218a7fc54215 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 57/95] 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 79de19552354b59afd46d91318b260f24e0a22fe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 58/95] 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 447d9bdf0f4e7f06e662c0d28f137614470e6dcb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 59/95] 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 0197b3f8f5ce9a2f068cf6a53a7d71e099fa102a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 60/95] 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 147b731512dc100d01d3e95c2f5f475bd85495cd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 61/95] 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 5a7933e38a4bd92c8be313f930113950a8a21421 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 62/95] 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 50f0a2f84d5378f75974dfe70e8dae2b671c5279 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 63/95] gspell: update to 1.8.4.

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..7c4228fd5757 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"
@@ -9,17 +9,22 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 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"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 0fe31118a15386c894cff3262c2d955f08a87944 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 64/95] 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 8dad237b416a145dcecaa7169e3a85c2fe4de932 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 65/95] 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 5a3df56b0287fe7ecbb1cae4508b82ddd52278c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 66/95] 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 4b3d614f4f05458580073d45dfa4955480840b4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 67/95] libvirt-glib: update to 4.0.0.

* make gtk doc a build_option to fix cross. Default is off.
---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 +++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 22 +++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,23 +1,23 @@
 # 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)"
-hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
- python-devel $(vopt_if vala vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 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"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From db0585cc96d500d13570b38f5cfd66c9c26d159b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 68/95] 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 e90cd61b1db3a5f871b36c7fa997b269567c090e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 69/95] 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 906b886ae26a433a8bf867955a41795ab8e0e28e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 70/95] gnome-boxes: update to 40.0.

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

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..86f01ea8432f 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
@@ -8,13 +8,13 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 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"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
+ tracker3-devel"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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 4e5c56a92f8922e359ebd20ab4165f2ed7918431 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 71/95] 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 2dea816da9e5e8a275d10b00159c1bf660fce811 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 72/95] gnome-books: update to 40.0.

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index 1d4974fe1832..feb752614ace 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"
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-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 5647e2a6ee5b19b97f573cd4ca02378c603061a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 73/95] gnome-bluetooth: update to 3.34.5.

* fix tests
---
 srcpkgs/gnome-bluetooth/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 9a9480ad0ab1..83d89c0a8acb 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
@@ -10,12 +10,13 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 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 918352cf5efacb4a488f706ddf9565b37262745f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 74/95] 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 d15716c0bfa3cd7b3be66f734f43a73728433d4f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 75/95] 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 60bf97d11ade9c6aa6f0677f4a79ca6cd6496dc7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 76/95] 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 e1eb99f161e6625f9c94c3f76f37ec9cba7c849d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 77/95] 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 533e9e82a1f3cb540b44dff28c2f1a61e9e79817 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 78/95] 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 167974d87f1d658b47f96024bc4087e47148bcad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 79/95] jsonrpc-glib: update to 3.38.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..b17223455261 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"
@@ -34,4 +34,3 @@ jsonrpc-glib-devel_package() {
 		fi
 	}
 }
-

From a937ab9733abab052b3708ad01166602e1cf1f23 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 80/95] 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 08805c5696e2f010e8ba23ad96943c1ac088a0b6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 81/95] 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 3bdfd5781b1aa74411f24a343228d76efcf45477 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 82/95] 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 987edcd20d21e9d611c7ea31f716119a15af47af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 83/95] 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 996d469ffb13b0fbf45da0a050cf848110cf9e6c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 84/95] 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 e32f191217a41d29fe6b2446317b349aa9105548 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 85/95] libpeas: update to 1.30.0.

* fix tests
---
 srcpkgs/libpeas/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index be9de4fd4c65..c088c6f11478 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"
@@ -9,12 +9,17 @@ hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
 depends="python3-gobject hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gobject-based plugins engine"
 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
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel

From 16442539e1bfdfea276130987f2dc5e70d669be3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 86/95] 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"

From 4aaf8f726d00ea0d14c279f85f1c33da4551b957 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 87/95] 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 9db7bffedde7a4f4400c9993698235fc56a9213b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 88/95] removed-packaes: add gnome-getting-started-docs

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From 44c418a09a3dbd3d524946ed23e3ef57aa2fee30 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 89/95] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From c9fa21e0e5a6b00497358e6606ffd0df38368f32 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 90/95] 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..fedf6b594530 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>=3.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.5
  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 42bd9e9b5e99a5500ac98e2be9f4597ff09795b8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 91/95] gnome: update to 40.0.

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..40d177182045 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,71 @@ 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>=3.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-books>=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>=40.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
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

From 9911f594368c9c4bafa86666fae48cb04b339817 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 92/95] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
+version=2.6.9
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From 2a795961c7a15224b03d0253ce57fe912ec76a3c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:10 +0200
Subject: [PATCH 93/95] giggle: doesn't need vte290.

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

diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 1984fed3f638..8240dd9afcd1 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config itstool intltool glib-devel git
  automake gettext-devel libtool tar yelp-tools"
-makedepends="gtksourceview-devel vte290-devel"
+makedepends="gtksourceview-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6d243d761920d103fdc3398f9386e5e84454df79 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 94/95] 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 d2622f0b91a63741350ba6c65577db73296787c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 95/95] 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"

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

* Re: [PR PATCH] [Merged]: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (104 preceding siblings ...)
  2021-04-09 16:52 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-09 16:54 ` Gottox
  2021-04-12  5:12 ` thegarlynch
                   ` (7 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-09 16:54 UTC (permalink / raw)
  To: ml

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

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

Update to Gnome-40
https://github.com/void-linux/void-packages/pull/29974

Description:
## Platforms:
* [ ] aarch64-musl
* [ ] aarch64
* [x] armv6l-musl
* [ ] armv6l
* [x] armv7l-musl
* [ ] armv7l
* [ ] i686
* [ ] ppc-musl
* [ ] ppc
* [ ] ppc64-musl
* [ ] ppc64
* [ ] ppc64le-musl
* [ ] ppc64le
* [ ] ppcle-musl
* [ ] ppcle
* [x] x86_64-musl
  * [x] compile
  * [x] check
* [x] x86_64
  * [x] compile
  * [x] check

## TODO
* [ ] update vala
* [ ] update tracker-miners
* [ ] functional test
* [x] python3-gobject tests fail on x86_64
* [x] gspell tests fail on x86_64
* [x] dconf tests fail on x86_64
* [x] glib tests fail on x86_64-musl
* [x] gobject-introspection fails on cross armv7hf

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (105 preceding siblings ...)
  2021-04-09 16:54 ` [PR PATCH] [Merged]: " Gottox
@ 2021-04-12  5:12 ` thegarlynch
  2021-04-12  5:19 ` Oreo639
                   ` (6 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: thegarlynch @ 2021-04-12  5:12 UTC (permalink / raw)
  To: ml

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

New comment by thegarlynch on void-packages repository

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

Comment:
Wait, gnome 40 is not different package ? i thought it is different in windows 8 and windows 10 kind of way

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (106 preceding siblings ...)
  2021-04-12  5:12 ` thegarlynch
@ 2021-04-12  5:19 ` Oreo639
  2021-04-12  5:20 ` Oreo639
                   ` (5 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-12  5:19 UTC (permalink / raw)
  To: ml

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

New comment by Oreo639 on void-packages repository

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

Comment:
GNOME is a desktop environment and Windows is an operating system, so this isn't a great comparison.
Void Linux is a rolling release distro meaning that there is only one version of Void Linux and that is constantly being updated with the latest versions of packages (with patches and bugfixes if necessary).

Gnome 40 is a new version of the GNOME desktop environment and is not a new DE. (it is meant to replace Gnome 3.38)

There is a versioning scheme that exists with other "stable" distros (which just means that the packages stay the same for that release of the distro and only get patched with bugfixes and security fixes).

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (107 preceding siblings ...)
  2021-04-12  5:19 ` Oreo639
@ 2021-04-12  5:20 ` Oreo639
  2021-04-12  5:23 ` Oreo639
                   ` (4 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-12  5:20 UTC (permalink / raw)
  To: ml

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

New comment by Oreo639 on void-packages repository

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

Comment:
GNOME is a desktop environment and Windows is an operating system, so this isn't a great comparison.
Void Linux is a rolling release distro meaning that there is only one version of Void Linux and that is constantly being updated with the latest versions of packages (with patches and bugfixes if necessary).

Gnome 40 is a new version of the GNOME desktop environment but isn't a separate DE. (it is meant to replace Gnome 3.38)

There is a versioning scheme that exists with other "stable" distros (which just means that the packages stay the same for that release of the distro and only get patched with bugfixes and security fixes).

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (108 preceding siblings ...)
  2021-04-12  5:20 ` Oreo639
@ 2021-04-12  5:23 ` Oreo639
  2021-04-12  5:24 ` Oreo639
                   ` (3 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-12  5:23 UTC (permalink / raw)
  To: ml

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

New comment by Oreo639 on void-packages repository

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

Comment:
GNOME is a desktop environment and Windows is an operating system, so this isn't a great comparison.
Void Linux is a rolling release distro meaning that there is only one version of Void Linux and that is constantly being updated with the latest versions of packages (with patches and bugfixes if necessary).

Gnome 40 is a new version of the GNOME desktop environment but isn't a separate DE. (it is meant to replace Gnome 3.38) The packaging in Void will reflect that.

There is a versioning scheme that exists with other "stable" distros (which just means that the packages stay the same for that release of the distro and only get patched with bugfixes and security fixes).

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (109 preceding siblings ...)
  2021-04-12  5:23 ` Oreo639
@ 2021-04-12  5:24 ` Oreo639
  2021-04-12  5:25 ` Oreo639
                   ` (2 subsequent siblings)
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-12  5:24 UTC (permalink / raw)
  To: ml

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

New comment by Oreo639 on void-packages repository

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

Comment:
Gnome 40 is a new version of the GNOME desktop environment but isn't a separate DE. (it is meant to replace Gnome 3.38) The packaging in Void will reflect that.

Void Linux is a rolling release distro meaning that there is only one version of Void Linux and that is constantly being updated with the latest versions of packages (with patches and bugfixes if necessary).

There is a versioning scheme that exists with other "stable" distros (which just means that the packages stay the same for that release of the distro and only get patched with bugfixes and security fixes).

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (110 preceding siblings ...)
  2021-04-12  5:24 ` Oreo639
@ 2021-04-12  5:25 ` Oreo639
  2021-04-12  5:46 ` Gottox
  2021-04-12  6:55 ` thegarlynch
  113 siblings, 0 replies; 114+ messages in thread
From: Oreo639 @ 2021-04-12  5:25 UTC (permalink / raw)
  To: ml

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

New comment by Oreo639 on void-packages repository

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

Comment:
Void Linux is a rolling release distro meaning that there is only one version of Void Linux and that is constantly being updated with the latest versions of packages (with patches and bugfixes if necessary).

Gnome 40 is a new version of the GNOME desktop environment but isn't a separate DE. (it is meant to replace Gnome 3.38) The packaging in Void will reflect that.

There is a versioning scheme that exists with other "stable" distros (which just means that the packages stay the same for that release of the distro and only get patched with bugfixes and security fixes).

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (111 preceding siblings ...)
  2021-04-12  5:25 ` Oreo639
@ 2021-04-12  5:46 ` Gottox
  2021-04-12  6:55 ` thegarlynch
  113 siblings, 0 replies; 114+ messages in thread
From: Gottox @ 2021-04-12  5:46 UTC (permalink / raw)
  To: ml

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

New comment by Gottox on void-packages repository

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

Comment:
There are several changes in the frontend, but from a packaging perspective it's very much like a Gnome 3.40.

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

* Re: Update to Gnome-40
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
                   ` (112 preceding siblings ...)
  2021-04-12  5:46 ` Gottox
@ 2021-04-12  6:55 ` thegarlynch
  113 siblings, 0 replies; 114+ messages in thread
From: thegarlynch @ 2021-04-12  6:55 UTC (permalink / raw)
  To: ml

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

New comment by thegarlynch on void-packages repository

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

Comment:
Holyshit, it's great. Did they improved the performance or something ? it runs smoother compared to previous version of gnome i've run

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

end of thread, other threads:[~2021-04-12  6:55 UTC | newest]

Thread overview: 114+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29974@inbox.vuxu.org>
2021-04-03 13:19 ` Update to Gnome-40 Gottox
2021-04-03 16:25 ` Oreo639
2021-04-03 16:30 ` Oreo639
2021-04-03 16:30 ` Oreo639
2021-04-03 16:33 ` Oreo639
2021-04-03 16:35 ` Oreo639
2021-04-03 16:35 ` Oreo639
2021-04-03 16:37 ` Gottox
2021-04-03 17:59 ` [PR PATCH] [Updated] " Gottox
2021-04-03 18:07 ` Gottox
2021-04-03 18:12 ` Gottox
2021-04-03 18:49 ` Gottox
2021-04-03 18:53 ` [PR REVIEW] " Oreo639
2021-04-03 18:53 ` Oreo639
2021-04-03 18:59 ` Oreo639
2021-04-03 19:27 ` [PR PATCH] [Updated] " Gottox
2021-04-03 19:28 ` [PR REVIEW] " Gottox
2021-04-03 19:28 ` Gottox
2021-04-03 20:28 ` [PR PATCH] [Updated] " Gottox
2021-04-03 21:52 ` Gottox
2021-04-03 21:58 ` Gottox
2021-04-03 22:11 ` Gottox
2021-04-03 22:14 ` Gottox
2021-04-04  7:21 ` Gottox
2021-04-04  7:58 ` Gottox
2021-04-04  8:39 ` Gottox
2021-04-04  9:14 ` Gottox
2021-04-04  9:27 ` Gottox
2021-04-04  9:50 ` [PR PATCH] [Updated] " Gottox
2021-04-04 10:00 ` Gottox
2021-04-04 10:10 ` Gottox
2021-04-04 11:31 ` Gottox
2021-04-04 15:19 ` Gottox
2021-04-05 10:06 ` Gottox
2021-04-05 10:17 ` Gottox
2021-04-05 10:52 ` [PR PATCH] [Updated] " Gottox
2021-04-05 15:10 ` Gottox
2021-04-05 15:20 ` Gottox
2021-04-05 17:21 ` [PR PATCH] [Updated] " Gottox
2021-04-05 17:24 ` Gottox
2021-04-05 22:11 ` Gottox
2021-04-05 22:14 ` Gottox
2021-04-05 23:50 ` ericonr
2021-04-05 23:56 ` ericonr
2021-04-05 23:57 ` ericonr
2021-04-05 23:58 ` ericonr
2021-04-06  7:13 ` Gottox
2021-04-06  7:33 ` Gottox
2021-04-06  7:42 ` Gottox
2021-04-06  7:44 ` Gottox
2021-04-06  8:06 ` Gottox
2021-04-06 10:59 ` [PR PATCH] [Updated] " Gottox
2021-04-06 11:18 ` Gottox
2021-04-06 13:06 ` Gottox
2021-04-06 13:09 ` [PR PATCH] [Updated] " Gottox
2021-04-06 13:09 ` Gottox
2021-04-06 19:00 ` [PR PATCH] [Updated] " Gottox
2021-04-07  2:27 ` fosslinux
2021-04-07  7:10 ` Gottox
2021-04-07  7:13 ` Gottox
2021-04-07  7:37 ` [PR REVIEW] " Piraty
2021-04-07  7:37 ` Piraty
2021-04-07  7:37 ` Piraty
2021-04-07  7:37 ` Piraty
2021-04-07  7:37 ` Piraty
2021-04-07  7:37 ` Piraty
2021-04-07  7:37 ` Piraty
2021-04-07  7:39 ` Gottox
2021-04-07  7:39 ` Gottox
2021-04-07  7:40 ` Gottox
2021-04-07  7:43 ` Gottox
2021-04-07  7:43 ` Gottox
2021-04-07  7:45 ` Gottox
2021-04-07  7:46 ` Gottox
2021-04-07  7:53 ` Gottox
2021-04-07  7:53 ` Gottox
2021-04-07  8:03 ` Gottox
2021-04-07  8:04 ` [PR PATCH] [Updated] " Gottox
2021-04-07  8:05 ` [PR REVIEW] " Gottox
2021-04-07  8:06 ` Gottox
2021-04-07 11:35 ` [PR REVIEW] " sgn
2021-04-07 11:35 ` sgn
2021-04-07 12:25 ` Piraty
2021-04-08  0:56 ` circhioz
2021-04-08  0:56 ` circhioz
2021-04-08  0:56 ` circhioz
2021-04-08  1:14 ` circhioz
2021-04-08  9:03 ` [PR REVIEW] " Gottox
2021-04-08  9:05 ` Gottox
2021-04-08  9:05 ` Gottox
2021-04-08  9:28 ` [PR PATCH] [Updated] " Gottox
2021-04-08  9:28 ` Gottox
2021-04-08  9:29 ` Gottox
2021-04-08  9:30 ` Gottox
2021-04-08  9:49 ` [PR PATCH] [Updated] " Gottox
2021-04-08 10:58 ` Gottox
2021-04-08 10:59 ` Gottox
2021-04-08 11:04 ` FollieHiyuki
2021-04-08 11:07 ` Gottox
2021-04-08 11:07 ` [PR PATCH] [Updated] " Gottox
2021-04-08 17:34 ` ericonr
2021-04-08 18:15 ` [PR PATCH] [Updated] " Gottox
2021-04-08 18:16 ` Gottox
2021-04-08 18:17 ` Gottox
2021-04-09 16:52 ` [PR PATCH] [Updated] " Gottox
2021-04-09 16:54 ` [PR PATCH] [Merged]: " Gottox
2021-04-12  5:12 ` thegarlynch
2021-04-12  5:19 ` Oreo639
2021-04-12  5:20 ` Oreo639
2021-04-12  5:23 ` Oreo639
2021-04-12  5:24 ` Oreo639
2021-04-12  5:25 ` Oreo639
2021-04-12  5:46 ` Gottox
2021-04-12  6:55 ` thegarlynch

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