Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: tut-0.0.28
@ 2021-08-27  8:23 NateDogg1232
  2021-08-27  9:14 ` [PR PATCH] [Updated] " NateDogg1232
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: NateDogg1232 @ 2021-08-27  8:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/NateDogg1232/void-packages tut
https://github.com/void-linux/void-packages/pull/32699

New package: tut-0.0.28
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From f3ad4ab862e2ab159b73ab2897cd64640dc469fa Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Fri, 27 Aug 2021 01:20:13 -0700
Subject: [PATCH] New package: tut-0.0.28

---
 srcpkgs/tut/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/tut/template

diff --git a/srcpkgs/tut/template b/srcpkgs/tut/template
new file mode 100644
index 000000000000..f86c282322e4
--- /dev/null
+++ b/srcpkgs/tut/template
@@ -0,0 +1,19 @@
+# Template file for 'tut'
+pkgname=tut
+version=0.0.28
+revision=1
+build_style=go
+go_import_path="github.com/RasmusLindroth/tut@$version"
+
+
+hostmakedepends="git"
+short_desc="TUI client for Mastodon"
+maintainer="Nathaniel Barragan <nathanielbarragan@protonmail.com>"
+license="MIT"
+homepage="https://github.com/RasmusLindroth/tut"
+distfiles="https://github.com/RasmusLindroth/tut/archive/${version}.tar.gz"
+checksum=b90cca232bcd13c601d2c5a12573dc0e45b6702a2dd9d892607df4b0d71270e0
+
+post_install() {
+	vlicense LICENSE
+}

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

* Re: [PR PATCH] [Updated] New package: tut-0.0.28
  2021-08-27  8:23 [PR PATCH] New package: tut-0.0.28 NateDogg1232
@ 2021-08-27  9:14 ` NateDogg1232
  2021-08-27  9:15 ` [PR PATCH] [Closed]: " NateDogg1232
  2021-08-27  9:15 ` NateDogg1232
  2 siblings, 0 replies; 4+ messages in thread
From: NateDogg1232 @ 2021-08-27  9:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/NateDogg1232/void-packages tut
https://github.com/void-linux/void-packages/pull/32699

New package: tut-0.0.28
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From f3ad4ab862e2ab159b73ab2897cd64640dc469fa Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Fri, 27 Aug 2021 01:20:13 -0700
Subject: [PATCH 001/904] New package: tut-0.0.28

---
 srcpkgs/tut/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/tut/template

diff --git a/srcpkgs/tut/template b/srcpkgs/tut/template
new file mode 100644
index 000000000000..f86c282322e4
--- /dev/null
+++ b/srcpkgs/tut/template
@@ -0,0 +1,19 @@
+# Template file for 'tut'
+pkgname=tut
+version=0.0.28
+revision=1
+build_style=go
+go_import_path="github.com/RasmusLindroth/tut@$version"
+
+
+hostmakedepends="git"
+short_desc="TUI client for Mastodon"
+maintainer="Nathaniel Barragan <nathanielbarragan@protonmail.com>"
+license="MIT"
+homepage="https://github.com/RasmusLindroth/tut"
+distfiles="https://github.com/RasmusLindroth/tut/archive/${version}.tar.gz"
+checksum=b90cca232bcd13c601d2c5a12573dc0e45b6702a2dd9d892607df4b0d71270e0
+
+post_install() {
+	vlicense LICENSE
+}

From c7e9753b0fe3da7cdb56a4689d5e3a4c09afabb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:04:17 -0300
Subject: [PATCH 002/904] New package: linux-base-2021.07.21

Base package to be used as dependency for linux and linux-lts. This way
they can share the same code and users who want to stick with a given
kernel version can just install that one and linux-base instead of
needing the linux or linux-lts meta and ignorepkg dances.
---
 srcpkgs/linux-base/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/linux-base/template

diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac

From c77e39a8e6872156cc233b4bfdecd2cbabf1a1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:31 -0300
Subject: [PATCH 003/904] linux: update to 5.13.

Also move to using linux-base.
---
 srcpkgs/linux/template | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

From d100180dd272428794cf60146c4b6e7bc683393c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:46 -0300
Subject: [PATCH 004/904] linux-lts: update to 5.10.

Also move to using linux-base and xlint.
---
 srcpkgs/linux-lts/template | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

From 7d19aca6ec65925ec0750ffcdbf4646695564406 Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Tue, 3 Aug 2021 19:43:30 -0700
Subject: [PATCH 005/904] cc65: update to 2.19.

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

diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 

From d899d1f4499dbc36761408510863118cb8d262db Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 13:08:46 -0700
Subject: [PATCH 006/904] CLion: update to 2021.2.

---
 srcpkgs/CLion/template | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..f2ab575cea34 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -28,8 +28,19 @@ post_extract() {
 	# Remove files for other CPU architectures
 	rm -rf bin/fsnotifier-arm
 	rm -rf lib/pty4j-native/linux/aarch64
+	rm -rf lib/pty4j-native/linux/arm
 	rm -rf lib/pty4j-native/linux/mips64el
 	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
@@ -37,6 +48,7 @@ post_extract() {
 			rm -rf bin/clion.vmoptions
 			rm -rf bin/libyjpagent-linux.so
 			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/performanceTesting/bin/libyjpagent.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
 		i686)
@@ -44,6 +56,7 @@ post_extract() {
 			rm -rf bin/clion64.vmoptions
 			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac

From c34130118c8b8aca8d3f9e3cb82cfd949e7ffd41 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:26:08 +0300
Subject: [PATCH 007/904] bmake: update to 20210704.

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

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..17f5dc72ad89 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210704
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+checksum=3efe8e1b11c52c9a396787df1d383a20de725115055dab4fdba04f8557315c36
 python_version=3
 
 do_configure() {

From 70957b8e50f4dc0b8b495c23de46096bbae28502 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:35:29 +0300
Subject: [PATCH 008/904] help2man: update to 1.48.3.

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

diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes

From 73cd1aa1dbda7deef0953f4f5a8c5872d1c1e7a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 15:48:40 +0200
Subject: [PATCH 009/904] apk-tools: update to 2.12.7.

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

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {

From a6246cb5b0176743a95988a72f5b2ecfec204d8a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:25:52 +0200
Subject: [PATCH 010/904] erlang: update to 24.0.5.

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 9c7d0b1ddce77b695ca8be6275f8b126289b64fb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:26:13 +0200
Subject: [PATCH 011/904] linux5.13: update to 5.13.8.

Use classic timestamp in KBUILD_BUILD_TIMESTAMP.
---
 srcpkgs/linux5.13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..43a3f6aa16a6 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.8
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ dfbaaf312cd69021fbe8ab597460aa961b8d2944efca35caa26b36fce43e616d"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 

From 83ef3304aae12e15d2feca97eb62887cbd87485b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:28:18 +0200
Subject: [PATCH 012/904] linux5.10: update to 5.10.56.

Use classic timestamp in KBUILD_BUILD_TIMESTAMP.
---
 srcpkgs/linux5.10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 2832c9d04add..6242d17550e8 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.54
+version=5.10.56
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44
+checksum=4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 

From 7a092052e5318c16332472e5a450cf9bc6897f3f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voiceops.com>
Date: Wed, 4 Aug 2021 13:09:36 -0500
Subject: [PATCH 013/904] New package: sftpgo-2.1.0

---
 srcpkgs/sftpgo/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/sftpgo/template

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}

From 14d99cfe489f872452b176337328162bccb264f4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 Aug 2021 20:56:10 +0200
Subject: [PATCH 014/904] icdiff: update to 2.0.4.

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

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 3af6dfdcd074..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,6 +1,6 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.3
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=23e9502895999a929e1d3559403205846742f7cf8a22c5d7f3c4db910ba12321
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"

From 2087d0a86ae9e2ddf62304d65530cde44cca7431 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 Aug 2021 20:57:32 +0200
Subject: [PATCH 015/904] prosody: update to 0.11.10.

Fixes CVE-2021-37601.
---
 srcpkgs/prosody/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"

From 2b58974278aab079a4d56faa3764bd8f4c4b1853 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 3 Aug 2021 10:37:50 +0200
Subject: [PATCH 016/904] fail2ban: update to version 0.11.2

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

diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3

From f38a1cabefef4c5de295bdeb8742f2994a782dc6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 017/904] New package: python3-smartypants-2.0.1

---
 srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-smartypants/template

diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}

From 9c913adec95ce8608a150bb93d385597f374266f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 018/904] New package: python3-typogrify-2.0.7

---
 srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-typogrify/template

diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 99734af3c589d1145dc530b1a392398b24f05b1c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 019/904] New package: gi-docgen-2021.6

---
 srcpkgs/gi-docgen/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/gi-docgen/template

diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails

From 6ad8aac51b008ac328989079aeac5540f014ead1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 7 Jul 2021 17:08:00 +0200
Subject: [PATCH 020/904] sysprof: update to 3.40.1.

---
 srcpkgs/sysprof/patches/build.patch |  10 --
 srcpkgs/sysprof/patches/musl.patch  | 157 ----------------------------
 srcpkgs/sysprof/template            |  12 +--
 3 files changed, 4 insertions(+), 175 deletions(-)
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch

diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }

From a3c461f3dd745b25befd4369e0d8590ac498fa5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Jun 2021 23:48:13 +0200
Subject: [PATCH 021/904] gtk4: update to 4.2.1, split docs, enable sysprof

---
 srcpkgs/gtk4-doc                       |  1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch | 23 ++++++++++++++++
 srcpkgs/gtk4/template                  | 36 +++++++++++++++++++-------
 3 files changed, 50 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch

diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 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=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 2c0c3350fa17d419c692af81b5786a2f8ab3bc59 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 3 Aug 2021 20:56:22 +0200
Subject: [PATCH 022/904] electrum: update to 4.1.5.

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

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \

From 9df674d535091a6aad9144234c67735de70b3d31 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 18 Jul 2021 11:01:29 +0200
Subject: [PATCH 023/904] libinput: update to 1.18.1.

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

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"

From 523fb1b0de04fcfb210e9f4aef2a22d7fb8c09c2 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Thu, 5 Aug 2021 11:10:15 -0400
Subject: [PATCH 024/904] shotcut: remove qt5-webkit-devel dep

shotcut does not use webkit since
https://github.com/mltframework/shotcut/commit/a44fe75a4dc7410668935cd0d3470994f5997571.
no revbump because this is purely build-time change.
---
 srcpkgs/shotcut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"

From 50cad14a20c02fe731a0d021dcc2aec7a0e6477a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 19:56:44 +0300
Subject: [PATCH 025/904] notcurses: update to 2.3.13.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 4b3563f65ffc..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.12
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=ce042908fac11f7df1f9eaa610e46e9c615f53ab036b7c27ae2396292512407b
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 28e6744e7bd92919bca94fbbf81158c3374f3263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 5 Aug 2021 09:27:02 -0300
Subject: [PATCH 026/904] nvidia: fix proton errors.

Proton sometimes errors out with:

  The NVIDIA driver was unable to open
  'libnvidia-glvkspirv.so.470.57.02'. This library is required at run
  time.

This is caused by an out of date glibc cache, so we now run ldconfig in
INSTALL. This solution was pointed out by mvf.

Unfortunately, this isn't the entirely correct solution: ldconfig should
always be run after package installations that touch /usr/lib, to avoid
similar issues. Until there's a simple solution for it (maybe general
purpose XBPS hooks), this is the best we can do.

Fixes: #32222
---
 srcpkgs/nvidia/INSTALL  | 3 +++
 srcpkgs/nvidia/template | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia/INSTALL

diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..9c022ef65649 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.57.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"

From 404b075b651e53e3972a347e2974611943d3661d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:01:56 +0300
Subject: [PATCH 027/904] font-awesome5: update to 5.15.4.

Also:
- add changelog.

Closes: #32339 [via git-merge-pr]
---
 srcpkgs/font-awesome5/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 

From a08e2c19d41e07ae9b8f165118c551c5dc9e4608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=A9TwT?= <vcyzscape@gmail.com>
Date: Fri, 6 Aug 2021 00:55:17 +0700
Subject: [PATCH 028/904] zoom: update to 5.7.28991.0726_1

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 01ea594d534a8f8cc411c2bb66a81a58131aa607 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 12:49:42 +0200
Subject: [PATCH 029/904] ipset: update to 7.15.

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

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 51150121385d..77c85ff074f7 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.14
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"

From 47e681a08050faeed20e210307ba421e1c379a7b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 21:36:27 +0200
Subject: [PATCH 030/904] extrace: update to 0.8.

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

diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE

From 497019f2fe1b89238415165cee125b592d71931b Mon Sep 17 00:00:00 2001
From: George Matsumura <gmmatsumura01@bvsd.org>
Date: Mon, 12 Jul 2021 04:17:31 -0600
Subject: [PATCH 031/904] arcan: add arcan_sdl subpackage

arcan_sdl allows the running of arcan nested within a different
display server.
---
 srcpkgs/arcan/template | 13 +++++++++++--
 srcpkgs/arcan_sdl      |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/arcan_sdl

diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file

From f9c42cabc8c1e8bc31214c1c74bad83612ef01e3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 21:28:11 +0300
Subject: [PATCH 032/904] papirus-icon-theme: update to 20210802.

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

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons

From eb67fe76d24bb9fe69a98b6f022fdd9da091c0b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 21:45:16 +0200
Subject: [PATCH 033/904] ipset: fix checksum.

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

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 77c85ff074f7..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=27031c36d355907031cce41e65553e99bb013d762fcd55392f63d7e84760f900
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"

From 4c8ef62680d21e01c3af14e90f78e34bfb5a30c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 5 Aug 2021 22:51:37 +0200
Subject: [PATCH 034/904] New package: abcmidi-2021.06.27

---
 srcpkgs/abcmidi/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/abcmidi/template

diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38

From 8e97a96aac2199b430e5d5ef815329ade26e453a Mon Sep 17 00:00:00 2001
From: Wes Roberts <takq@a.zinc.email>
Date: Thu, 5 Aug 2021 18:12:44 -0400
Subject: [PATCH 035/904] timeshift: fix compatibility with util-linux 2.37.1.

Timeshift will only start in "Live USB Mode".

Upstream issues:
https://github.com/teejee2008/timeshift/issues/425
https://github.com/teejee2008/timeshift/issues/753
https://github.com/teejee2008/timeshift/issues/755
---
 srcpkgs/timeshift/patches/d437358a.patch | 23 +++++++++++++++++++++++
 srcpkgs/timeshift/template               |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch

diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"

From 9b1e79e36a42ab77dc1b28b09efb4d8c441d238d Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 5 Aug 2021 23:28:12 +0200
Subject: [PATCH 036/904] hcloud: update to 1.26.1.

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

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE

From 94b7a48ffc7dbea3768771103e7c1493370c7676 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 5 Aug 2021 21:29:38 +0300
Subject: [PATCH 037/904] zoxide: update to 0.7.3.

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

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE

From 0a49a560c3462d120c50519313673fcb8f12e84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 22:11:18 -0300
Subject: [PATCH 038/904] virtualbox-ose: update to 6.1.26.

Remove vsed added in 13b1a5d83b4f3d03689a150c2ddf080ee91587c0 with no
justification; another configure step needed GCC version to have been
obtained.

Fix build by setting the correct Qt5 base include path.
---
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk | 1 +
 srcpkgs/virtualbox-ose/template              | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {

From 893d0e17c723b2ce03c1763fc2b7195e462443a5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 14:51:17 +0200
Subject: [PATCH 039/904] nncp: update to 7.5.1.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 279d6235b763..48ae842e0016 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.5.0
+version=7.5.1
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=14d92dc5b8164ee44926d7af46da9f230c8f6207350cc7476db5cdfb8e7c3fe4
+checksum=b093a745c2eb9f5fe8341ed2a6f1ee75701b2646b5701baaf4e760d932cdd91a
 
 do_build() {
 	make

From d5e55ca66da988c54429df1c9917d17d9b6a1790 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:02:39 +0200
Subject: [PATCH 040/904] python3-pipx: update to 0.16.4.

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

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE

From a4475deb9696ce4c8205b59aade1aab08dd498df Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 5 Aug 2021 22:58:59 +0300
Subject: [PATCH 041/904] jrnl: update to 2.8.2.

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

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no

From 668917e14dab5e60985d42d8d1b282a1735dcdd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:48 +0700
Subject: [PATCH 042/904] cmake: update to 3.21.1.

---
 srcpkgs/cmake/patches/ar-lwyu.patch           | 20 +++++++++
 .../patches/ignore-crape-compiler-test.patch  | 13 ++++++
 srcpkgs/cmake/patches/test-none.patch         | 41 -------------------
 srcpkgs/cmake/template                        | 11 ++---
 4 files changed, 36 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch

diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do

From e97f8ffde8523b80906520b96ed92a76faba52cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:56 +0700
Subject: [PATCH 043/904] cmake-gui: update to 3.21.1.

---
 srcpkgs/cmake-gui/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.

From 047d9866289dfb4a3f4b5ea946f9587ee099c6d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:27:38 +0200
Subject: [PATCH 044/904] bcc: link LLVM dynamically.

As a distro, we want this anyway, but static linking also broke, e.g.
bpftrace: https://github.com/iovisor/bpftrace/issues/1855
---
 srcpkgs/bcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index c2b7a65c19fd..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=3
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"

From ea48654a060bec8c97d81d94d91c8d8f2e552b28 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:28:42 +0200
Subject: [PATCH 045/904] bpftrace: rebuild against bcc-0.21.0_4.

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

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..8ca8a7f2409f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=2
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run

From 0e73bc3da1639de74fcc6c436560482005a307e1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 16:20:59 +0200
Subject: [PATCH 046/904] bpftrace: set nostrip.

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

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 8ca8a7f2409f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools

From d40fbba0bc9ece9aff1afc20f2f3c3a6f79d3ed2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:52:35 -0400
Subject: [PATCH 047/904] cpp-utilities: update to 5.11.0.

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

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From ba54b18d2f879582bbb9be263fa5594579a02eaa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:53:14 -0400
Subject: [PATCH 048/904] tageditor: update to 3.4.2.

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

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..fbbbbe79bd3b 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 9f5319902474c2e9fa301fb86e5d21355e35de47 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:54:25 -0400
Subject: [PATCH 049/904] python3-pyzmq: update to 22.2.1.

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

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From 13a3d1bf9aba0331380063e829cd439c25477a6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 12:42:19 -0400
Subject: [PATCH 050/904] python3-pip: update to 21.2.3.

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

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 3e800139d4da..225ede1ccd09 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.2
+version=21.2.3
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=38e9250dfb0d7fa842492bede9259d4b3289a936ce454f7c58f059f28a94c01d
+checksum=91e66f2a2702e7d2dcc092ed8c5ebe923e69b9997ea28ba25823943bcd3bf820
 # Tests have unpackaged dependencies
 make_check=no
 

From 1a3ef7b962366879b8d545151351aab7e9b39b20 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 22 Jul 2021 17:41:10 +0200
Subject: [PATCH 051/904] zsh-autosuggestions: update to 0.7.0.

---
 srcpkgs/zsh-autosuggestions/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }

From c016672e56794ee286a3cd49e67a444def4c1e60 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 19:05:59 +0200
Subject: [PATCH 052/904] gotop: update to 4.1.2.

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

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE

From ba4ce9427a0583e19597e15a37ccd4291434c640 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:01:55 +0200
Subject: [PATCH 053/904] vala: update to 0.52.4.

---
 common/shlibs                                 |  2 +-
 .../vala/patches/disable-unstable-tests.patch | 14 ++++++++++++++
 srcpkgs/vala/template                         | 19 ++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch

diff --git a/common/shlibs b/common/shlibs
index f768a637aed5..7a0c44e9a713 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
 libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {

From 046f3e80b1f10141cea03842986beae1d063b8ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:08:12 +0200
Subject: [PATCH 054/904] valadoc: update to 0.52.4.

---
 common/shlibs            | 2 +-
 srcpkgs/valadoc/patches  | 1 +
 srcpkgs/valadoc/template | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/valadoc/patches

diff --git a/common/shlibs b/common/shlibs
index 7a0c44e9a713..7e6b6fb0d1d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3120,7 +3120,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if

From b2c486aa1ba0c8ff71c3df084455978cbf781359 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 20:05:29 +0200
Subject: [PATCH 055/904] vala-language-server: update to 0.48.3.

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

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b

From 459a8dcf7172ef55335b92618a1809703b9618f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:19:57 +0200
Subject: [PATCH 056/904] io.elementary.code: rebuild with vala-0.52.4

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

diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"

From 896e77116a25c17e9e741b0f8aafb68ca17f9004 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:20:11 +0200
Subject: [PATCH 057/904] valabind: update to 1.8.0.

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

diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd

From f0c3565a1b986bbe9856d9d53b334aa2b5151e19 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 19:47:45 +0200
Subject: [PATCH 058/904] bomi: remove package.

Unmaintaned and broken, UI doesn't work.

Upstream issue:
https://github.com/ashinan/bomi/issues/540
---
 srcpkgs/bomi/patches/ffmpeg3.x.patch    |  32 ----
 srcpkgs/bomi/patches/ffmpeg4.patch      | 195 ------------------------
 srcpkgs/bomi/patches/fix-cxx14.patch    |  67 --------
 srcpkgs/bomi/patches/fix-sysctl_h.patch |  22 ---
 srcpkgs/bomi/template                   |  35 -----
 5 files changed, 351 deletions(-)
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template

diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}

From bfee4ff951b2882ccb42f20fc7bf99f7790b88db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 6 Aug 2021 16:25:50 -0300
Subject: [PATCH 059/904] removed-packages: add bomi and revbump.

---
 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 a4a0c532cad2..78ba7731cc3e 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=46
+revision=47
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1

From 699ebb0e2aed2a5ab407c3bd8eef4c78e6f40a7f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 20:18:21 +0200
Subject: [PATCH 060/904] dlayer: update to 0.3.1.

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

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE

From 4cd01bcbb74cfb7fa9e6003b40d038c60d0c591e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 20:19:37 +0200
Subject: [PATCH 061/904] skopeo: update to 1.4.0.

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

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From c79a3b411d8766f32516644b90d0a6b6da24cae2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 Aug 2021 22:36:22 +0300
Subject: [PATCH 062/904] font-sarasa-gothic: update to 0.34.1.

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

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 

From fde2ea58d199d39465e0d54d7335466a83330c92 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 6 Aug 2021 10:05:46 +0200
Subject: [PATCH 063/904] libid3tag: fix distfiles + lint error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

used mirror distfiles.exherbo.org doesn’t respond anymore
use original sourceforge download site
---
 srcpkgs/libid3tag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {

From 599ffcad54b79260c8f4fb999f2a07e30b3e40a3 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 6 Aug 2021 21:36:05 +0200
Subject: [PATCH 064/904] vscode: update to 1.59.0

---
 srcpkgs/vscode/patches/dont-download-ffmpeg.patch | 4 ++--
 srcpkgs/vscode/patches/gulp.patch                 | 4 ++--
 srcpkgs/vscode/patches/remove_git_command.patch   | 5 +++--
 srcpkgs/vscode/template                           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"

From 9132da0e52e5e677f4ec9aae23186e46fadea8ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 26 Apr 2021 09:53:55 +0200
Subject: [PATCH 065/904] New package: snowball-2.1.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libstemmer                            |  1 +
 srcpkgs/libstemmer-devel                      |  1 +
 .../snowball/patches/libstemmer-library.patch | 33 ++++++++++
 srcpkgs/snowball/template                     | 60 +++++++++++++++++++
 5 files changed, 96 insertions(+)
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template

diff --git a/common/shlibs b/common/shlibs
index 7e6b6fb0d1d6..b8fda590d5f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4027,3 +4027,4 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}

From fb6f14abd10581bf568107ee2d542bc580a84444 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 26 Apr 2021 12:04:43 +0200
Subject: [PATCH 066/904] geary: update to 40.0.

---
 srcpkgs/geary/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..3891e7190112 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in

From b12cf83a74ca342bce83be618a18446b4f4722a0 Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Fri, 6 Aug 2021 13:23:34 +0200
Subject: [PATCH 067/904] ugdb: update to 0.1.10.

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

diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE

From 9eedc203c772736cb6a84654c3893245330280ea Mon Sep 17 00:00:00 2001
From: Vo Kar <vokar97@pm.me>
Date: Fri, 6 Aug 2021 21:27:50 +0300
Subject: [PATCH 068/904] protonvpn-cli: add missing dependency

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

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index c9a3c784ace6..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,12 +1,13 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
 version=2.2.11
-revision=1
+revision=2
 wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"

From cd3fb3957809fbc1d0c6b058525bf87cb405c709 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 23:43:36 +0200
Subject: [PATCH 069/904] github-cli: update to 1.14.0.

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

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date

From ce81471cf8dec77ec021c5d2e05965a637a3c13d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 23:53:39 +0200
Subject: [PATCH 070/904] sigil: update to 1.7.0.

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

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 1b704654e31eb5b35d39d6b50b2531c3fe36ad83 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 22:24:59 +0200
Subject: [PATCH 071/904] go: update to 1.16.7.

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

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 

From 13588f9f04e458f9e5fb14f22dcf99fca000b0e3 Mon Sep 17 00:00:00 2001
From: notthewave <74874782+notthewave@users.noreply.github.com>
Date: Sat, 3 Jul 2021 00:25:52 +0200
Subject: [PATCH 072/904] New package: ART-1.9.3.

Since ART is a RawTherapee fork, the template is basically the same,
with the addition of exiv2 as a dependency.
---
 srcpkgs/ART/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/ART/template

diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e

From 4574c1082a7863adf81b0757d8b0b227431d66b2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 Aug 2021 10:24:34 +0200
Subject: [PATCH 073/904] linux5.4: update to 5.4.138.

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

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 807b6b49c848..c204d64759c3 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.137
+version=5.4.138
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f09e5e366ce5d8bde887cda229ef17138fd1653706a702221f934f99aaa31f7c
+checksum=a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 35b8b90405872af3a869a7eb162aaf3e6ea90dff Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 Aug 2021 10:26:19 +0200
Subject: [PATCH 074/904] linux4.19: update to 4.19.201.

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

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 1962af9c6030..b79ed782a91c 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.200
+version=4.19.201
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=307409d9c6b46eeb64d327ddd5ffe7c7e9a50fc1b4719caed670674d83e6081b
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From eeb51563fe141ee8de41aab6184e8c8fe9fbb5c9 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:58:04 +0200
Subject: [PATCH 075/904] portage: update to 3.0.21.

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

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf

From ad395ad31987cd8ce36e41b0f69c0b699fe45382 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:07:47 +0200
Subject: [PATCH 076/904] xdotool: update to 3.20210804.2.

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

diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 

From b078a26ba2a1a96707d017656debfd1b2f61f097 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:08:32 +0200
Subject: [PATCH 077/904] perl-WWW-Mechanize: update to 2.04.

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

diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171

From e3a7cb30918b0a795a8e2c1b5f44d05fe94da646 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:12:29 +0200
Subject: [PATCH 078/904] dovecot: update to 2.3.16.

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

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..27a781db5139 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
+version=2.3.16
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From a76ffd2abe4f657490fe85109e1ecd71b37486e6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:12:33 +0200
Subject: [PATCH 079/904] dovecot-plugin-pigeonhole: update to 0.5.16.

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

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c0620fd78f08440b4a8ea2e2775efac7d9d145ce Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:43:05 +0200
Subject: [PATCH 080/904] lnav: update to 0.10.0.

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

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..93df79547535 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=

From c8496e30658833cfd20be31e5200866158668515 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:39:54 +0000
Subject: [PATCH 081/904] firefox: orphan

---
 srcpkgs/firefox-i18n/template | 2 +-
 srcpkgs/firefox/template      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index d1526dfa7ba1..755b02d248c0 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -4,7 +4,7 @@ version=90.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..08c8efadf2d9 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -7,7 +7,7 @@ version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"

From 2c725abdc8fb64dbd8c1b622e317ccfd1defd166 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:40:29 +0000
Subject: [PATCH 082/904] ImageMagick: orphan

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"

From 689a5a8dcc06b580b21774b1a2c2fa45d45a5dea Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:40:37 +0000
Subject: [PATCH 083/904] ImageMagick6: orphan

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

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 7fbcb1d3150c..213d98a37659 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -16,7 +16,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
  libwmf-devel ocl-icd-devel pango-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"

From 4deb168e0450b35db55b522a1b4f2f3cb60d850a Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:20 +0000
Subject: [PATCH 084/904] cbindgen: orphan

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

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"

From 83715b07d01b928ced42e679e541e30b12da21a9 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:35 +0000
Subject: [PATCH 085/904] cozy: orphan

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

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b198300da9a4..b08360fffde3 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -11,7 +11,7 @@ depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"

From 4d52cfbffa057198833c2fa490894af06bd219bb Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:54 +0000
Subject: [PATCH 086/904] ffmpeg: orphan

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

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..0a0d24683082 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -4,7 +4,7 @@ pkgname=ffmpeg
 version=4.3.2
 revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"

From c3a959a5391a4fdc77e8f4701ed92b4c9150e41c Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:12 +0000
Subject: [PATCH 087/904] iverilog: orphan

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

diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"

From 9e1a5e1501e6ad3090e807cf350b9816b3aa5ded Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:29 +0000
Subject: [PATCH 088/904] kdenlive: orphan

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

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"

From b1b6db6793e718549d9411d78fd6c01243aa2eca Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:50 +0000
Subject: [PATCH 089/904] mercurial: orphan

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

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"

From a489babd937b8cee638a543b71ec821e217ee6ae Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:14 +0000
Subject: [PATCH 090/904] nv-codec-headers: orphan

---
 srcpkgs/nv-codec-headers/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"

From 162a5b1e7b40b16b101f8705f86fec0fda22e4b3 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:33 +0000
Subject: [PATCH 091/904] olive: orphan

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

diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"

From 93adff911b4bd0a83ee0ff01abc5fcb3cc68a00c Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:43 +0000
Subject: [PATCH 092/904] papi: orphan

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

diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"

From 715beda32e7b0f708e204880f7c2804f67edbc64 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:44:02 +0000
Subject: [PATCH 093/904] postgresql: orphan

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

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..6c30501a7c61 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -13,7 +13,7 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"

From 69789a54136d0e06c876f52242948a0314955fc6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 18:01:30 +0200
Subject: [PATCH 094/904] lnav: fix cross.

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

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 93df79547535..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh"
+hostmakedepends="automake openssh zlib-devel"
 makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
  pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"

From 7be2eabf6d9117660dc521528a7f87bf030ff969 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 7 Aug 2021 09:54:19 +0200
Subject: [PATCH 095/904] imv: update to 4.3.0.

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

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..608cc8790641 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {

From 8e7dea12411b5bd884cdc12acb781921bb414316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 7 Aug 2021 11:04:45 +0200
Subject: [PATCH 096/904] mpd: update to 0.22.10.

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From 57ca37383fbfe8e648a960d93ce427148f1e34d6 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Fri, 6 Aug 2021 16:45:33 +0200
Subject: [PATCH 097/904] herbstluftwm: update to 0.9.3

small cosmetic issues
---
 srcpkgs/herbstluftwm/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE

From 733b3cf8a7145dcaddaa5ebb685f8ba6ef243b1e Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Tue, 3 Aug 2021 19:25:58 -0700
Subject: [PATCH 098/904] hydroxide: update to 0.2.20.

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

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE

From d3986e878928bae0eaf9e7a974e8a8c26d925c96 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 19 Jul 2021 16:48:03 +0200
Subject: [PATCH 099/904] New package: tootle-1.0

---
 srcpkgs/tootle/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/tootle/template

diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496

From 53a52b30b4092ca0af067b600ab6af395ac2bc6d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 21:27:15 +0200
Subject: [PATCH 100/904] graphviz: depend on a default font.

With no fonts available (e.g. chroots), graphviz crashes in pango:
https://gitlab.gnome.org/GNOME/pango/-/issues/588

Depend on liberation fonts which provides the default
times font and most people have it anyway.
---
 srcpkgs/graphviz/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"

From e498e95f649b4589178a64a3f64e30c7eb56cf06 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 7 Aug 2021 21:49:21 +0200
Subject: [PATCH 101/904] lowdown: update to 0.8.6.

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

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md

From d69b5decbfdc42a6e535db6aae5e303cbf6eba09 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 7 Aug 2021 15:47:17 +0200
Subject: [PATCH 102/904] freerdp: update to 2.4.0

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

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;

From 17aaeb8723c0b73b7db182aeb69b1edd2c9f82dd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 8 Aug 2021 00:27:31 +0200
Subject: [PATCH 103/904] lynx: update to 2.9.0dev.9.

---
 srcpkgs/lynx/template | 11 +++++------
 srcpkgs/lynx/update   |  5 -----
 2 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 srcpkgs/lynx/update

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"

From 5662768960f05a3e087042d915b68d96e938a13e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 Aug 2021 00:19:58 +0300
Subject: [PATCH 104/904] cherrytree: update to 0.99.39.

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

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..8789cd37dba7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
+version=0.99.39
 revision=1
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"

From 67c965fa9b6ac8e7344d1ebaeb1d64531d21f437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 6 Aug 2021 09:45:27 +0700
Subject: [PATCH 105/904] deluge: allow deluged to be run as different user

Close: #31690
---
 srcpkgs/deluge/files/deluged/run       |  2 +-
 srcpkgs/deluge/patches/drop-priv.patch | 40 ++++++++++++++++++++++++++
 srcpkgs/deluge/template                |  2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch

diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"

From a66b638edd8be9fe6d908d1f6d15028bcd2e7344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 8 Aug 2021 11:23:37 +0700
Subject: [PATCH 106/904] vcompletion: return failure on wrong arguments

---
 common/environment/setup/install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }

From a8e1ddb7e507d7c28dde879928b6223ae5ae38b7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:46:47 +0300
Subject: [PATCH 107/904] cozy: update to 1.1.0.

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

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b08360fffde3..652ed886f3a9 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.4
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=d32b76e0a1506ab72d0b45bb0f5711c490a3105fce1019f173536f19716a07f2
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38

From 59ea10e8a4cadeb8f3b152bd76de64e74cde4e89 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH 108/904] New package: libadwaita-1.0.0alpha2

---
 common/shlibs                                 |  1 +
 srcpkgs/libadwaita-demo                       |  1 +
 srcpkgs/libadwaita-devel                      |  1 +
 .../patches/disable-broken-tests.patch        | 10 ++++
 srcpkgs/libadwaita/template                   | 59 +++++++++++++++++++
 5 files changed, 72 insertions(+)
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template

diff --git a/common/shlibs b/common/shlibs
index b8fda590d5f3..5affb5dc09fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3511,6 +3511,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..cb23b656c004
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-$_ver"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}

From ecddb6c2c646b6f1d7f78876ffee11585a6e371e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 8 Aug 2021 19:08:49 +0200
Subject: [PATCH 109/904] croc: update to 9.2.1.

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

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE

From 84a8fee261d0e54202c7e33a014324920ea7d77f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 22:09:09 +0300
Subject: [PATCH 110/904] putty: update to 0.76.

Also:
- add changelog.
---
 srcpkgs/putty/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 

From 959e48fce048028d6313ca570d0ce8b86aae0288 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 23:03:59 +0300
Subject: [PATCH 111/904] gpodder: update to 3.10.21.

Also:
- add necessary packages to depends and checkdepends.
---
 srcpkgs/gpodder/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest

From ec83e2b89b3f7b5667f8dbdfa3cf87c8665d6361 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 23:05:09 +0300
Subject: [PATCH 112/904] New package: python3-pytest-httpserver-1.0.1

---
 srcpkgs/python3-pytest-httpserver/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-httpserver/template

diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..d866ff71c6df
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc="pytest-httpserver-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}

From 31a33089670d0784f88205e81f90ed5517f782c2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:27:52 +0300
Subject: [PATCH 113/904] bmake: update to 20210803.

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

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 17f5dc72ad89..ef3463e7e554 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210704
+version=20210803
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=3efe8e1b11c52c9a396787df1d383a20de725115055dab4fdba04f8557315c36
+checksum=a7127d581661038219e21531486f4779b333eb5395e5c8fc2426b20badd24c87
 python_version=3
 
 do_configure() {

From 8bc89c7b32a403e1e2007dfa97f4a7f884646bd1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 21:58:01 +0300
Subject: [PATCH 114/904] stremio-shell: update to 4.4.142.

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

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {

From e0cb321a131b951b40dca91a94cab9dc658df1e9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 7 Aug 2021 15:39:08 +0200
Subject: [PATCH 115/904] master-pdf-editor: update to 5.7.90.

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

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5

From 190e30833d1cc91d9fc6f053470e47a93b2c6fef Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 13:03:39 +0300
Subject: [PATCH 116/904] catfish: update to 4.16.2.

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

diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b

From e48339fcdd5ad833c4dd468f33253ca9dea13aa9 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 10:15:35 +0200
Subject: [PATCH 117/904] py3status: update to 3.38.

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

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE

From d7597a71a60e22c719a977fb0c059b889cb9b9e3 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sat, 7 Aug 2021 11:05:38 +0300
Subject: [PATCH 118/904] sdparm: update to 1.12.

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

diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING

From f75ff9fdefc25235dd0d287985d752a465b2b068 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 13:09:34 +0300
Subject: [PATCH 119/904] xfce4-sensors-plugin: update to 1.4.1.

Closes: #32391 [via git-merge-pr]
---
 srcpkgs/xfce4-sensors-plugin/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling

From 36b1f3870a29304328ebfca5aef03b5c934493c5 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 7 Aug 2021 18:33:22 +0530
Subject: [PATCH 120/904] Komikku: update to 0.30.0.

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..7a612602214d 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
-revision=2
+version=0.30.0
+revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6

From e634d0bd48a1bb7d309e0fbae98411dac8a08b9e Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:19:29 +0200
Subject: [PATCH 121/904] drone-cli: update to 1.3.0.

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

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c

From e2bee4acc896c9828c91d6d887927d70d23e6e3f Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:43:00 +0200
Subject: [PATCH 122/904] gparted: update to 1.3.1.

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

diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:

From 8717ef0cddecc3b4115915864f433e37967e5a87 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:54:53 +0200
Subject: [PATCH 123/904] openimagedenoise: update to 1.4.1.

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

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest

From 2405e60082d9d05085e164a43d42c087aacc318a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 21:01:21 +0300
Subject: [PATCH 124/904] kvantum: update to 0.20.1.

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

diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf

From de42974376898c0cf8a295d95e23ad33954116f6 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 6 Aug 2021 13:38:14 +0300
Subject: [PATCH 125/904] mesa: add zink gallium driver

---
 srcpkgs/mesa/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8664f4d799bc..68d6a112681e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=21.1.6
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -152,9 +152,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +163,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 

From 223ae052b6e37caef430c538c451b4d09e93c7ae Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:42:54 +0300
Subject: [PATCH 126/904] qt5ct: update to 1.3.

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

diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..b0a5d19b3cba 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
+version=1.3
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING

From 32820db17e346bf18d79c1581b837170c61f0565 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 22:03:59 +0200
Subject: [PATCH 127/904] instaloader: update to 4.8.

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

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE

From 1290a5eee59fc985b302670ed4896b44b778371d Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 10:29:30 +0200
Subject: [PATCH 128/904] volctl: update to 0.9.0.

---
 srcpkgs/volctl/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code

From cc37087d8e6b4b7b99b81c69bec7fe5c3130a8e5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 3 Aug 2021 19:20:34 +0400
Subject: [PATCH 129/904] libcap: update to 2.52.

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

diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 2b519881a645d56618fe2037b682c19c2c3f4920 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 1 Aug 2021 17:00:00 +1000
Subject: [PATCH 130/904] retroarch: disable gles2 by default, add libusb and
 xdg-utils deps

When both gles2 and opengl options are enabled, RetroArch will only
build with OpenGL ES support. This prevents OpenGL only cores from working.
Disable gles2 by default and use the glcore driver which provides OpenGL 3.2+
and OpenGL ES 3+ support. Fixes: #32246

libusb support is automatic and is currently pulled in when sdl2 is enabled.
Add it to makedepends to ensure it's always enabled.

RetroArch will call xdg-screensaver when it's built with X11 support.
Add xdg-utils to depends when the x11 option is enabled.
---
 srcpkgs/retroarch/template | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 

From a6aeb2fb9fa10785eee6355c74e80442ebdc5ffb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:03:52 +0200
Subject: [PATCH 131/904] babashka: update to 0.5.1.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From ec5d075765cdec209b0f75aab8a0f05110765570 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:03:56 +0200
Subject: [PATCH 132/904] byacc: update to 20210808.

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

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index db54998f0f25..e987a97cce79 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210802
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=2949c67ed13bd67917f0c9bcc85c76d99a3090d21105ea7672a87a3502e3ccf6
+checksum=f3b0edd584a426da0ee1676e4ed7484e62f777c31ea33acf4c89d65e32c75cea
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 6e5c1d5c7ce4ba99d22e073927685f72c5d4ea59 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:05:37 +0200
Subject: [PATCH 133/904] nncp: update to 7.6.0.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 48ae842e0016..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.5.1
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=b093a745c2eb9f5fe8341ed2a6f1ee75701b2646b5701baaf4e760d932cdd91a
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make

From 02a8305d87c8c44e873322c87732e50a396f76af Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:06:38 +0200
Subject: [PATCH 134/904] ugrep: update to 3.3.7.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From fff87091671c27fea55b0bc214faf2a5ce285f00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 20:15:39 +0200
Subject: [PATCH 135/904] amdvlk: update to 2021.Q3.2.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..e91154da11d4 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.2
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=64a67716cf85de1a6bf7e1891acb10794d9bb56e
+_xgl_commit=9210b6802b964cd875628aa67a52fa44a4ec5017
+_pal_commit=3e6d3ab088f3b7b405250e75de112df37c49398a
+_llvm_project_commit=3558c46649a7ef673ff95c58266e59b09626abf0
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="51937640f931800723233341f86c9264d59c5787c3b0a9e783014cd6c5c45c47
+ 64f75bf5f16e7e5fa7173b8b178fe1703ec6c61cca6bab18d504de0e5cf95bc7
+ 62606f0d6442a8c2af0413254429fdc82897108968139005898f45c91d9e4683
+ fd9bb7bad274ecc746b672abb1edc954158c4333f7b2c4b888e996f966112e5c
+ d1f72bf91e15f345cb99185fb00d0da0c645ef7da0cebd4671f93b7181f9faae
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From 4fd62166ec10a2289fb6c059659059106a6c8ea4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 14:32:17 +0200
Subject: [PATCH 136/904] R-cran-ggplot2: update to 3.3.5.

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

diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea

From fa77138ef2f2d5d03f29842cf5ab661c23eda6f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:39:20 +0200
Subject: [PATCH 137/904] fixup! amdvlk: update to 2021.Q3.2.

---
 .../amdvlk/patches/cmake-build-type-none.patch   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt

From 81f9c96ef4c48cbc16f14e9cc0ddbd845186cece Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:43:42 +0200
Subject: [PATCH 138/904] SLADE: update to 3.1.13.

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

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in

From 5395c4f41fe6afdabf9f82df02478fad180cd766 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:44:06 +0200
Subject: [PATCH 139/904] amdvlk: update to 2021.Q3.3.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index e91154da11d4..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.2
+version=2021.Q3.3
 revision=1
-_llpc_commit=64a67716cf85de1a6bf7e1891acb10794d9bb56e
-_xgl_commit=9210b6802b964cd875628aa67a52fa44a4ec5017
-_pal_commit=3e6d3ab088f3b7b405250e75de112df37c49398a
-_llvm_project_commit=3558c46649a7ef673ff95c58266e59b09626abf0
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="51937640f931800723233341f86c9264d59c5787c3b0a9e783014cd6c5c45c47
- 64f75bf5f16e7e5fa7173b8b178fe1703ec6c61cca6bab18d504de0e5cf95bc7
- 62606f0d6442a8c2af0413254429fdc82897108968139005898f45c91d9e4683
- fd9bb7bad274ecc746b672abb1edc954158c4333f7b2c4b888e996f966112e5c
- d1f72bf91e15f345cb99185fb00d0da0c645ef7da0cebd4671f93b7181f9faae
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From 8d2102302dc5ca10410b70f307a486accc31ef64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:44:39 +0200
Subject: [PATCH 140/904] krita: update to 4.4.7.

---
 common/shlibs                                | 25 --------------------
 srcpkgs/krita/patches/aarch64.patch          | 19 +++++++++++++++
 srcpkgs/krita/patches/cross.patch            | 13 ++++++++++
 srcpkgs/krita/patches/invalid-MimeType.patch | 11 ---------
 srcpkgs/krita/template                       |  4 ++--
 5 files changed, 34 insertions(+), 38 deletions(-)
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch

diff --git a/common/shlibs b/common/shlibs
index 5affb5dc09fd..278d2456072f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 

From 51534053e40ae04885902bd9342200f41bfe52da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:45:22 +0200
Subject: [PATCH 141/904] pioneer: update to 20210723.

---
 srcpkgs/pioneer/patches/ppc.patch | 6 +++---
 srcpkgs/pioneer/template          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"

From 5fdca523bcedbcf858ef37925c3185c59f1fae63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 9 Aug 2021 13:03:25 +0200
Subject: [PATCH 142/904] homebank: update to 5.5.3.

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

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From ba3d051c08232502ea0c9ccf28c8965dcefde51a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:18:07 +0300
Subject: [PATCH 143/904] wps-office: update to 11.1.0.10702 and adopt.

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

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 

From 02cd61e00a75d243ba7807a13c7782c12e0d7c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 9 Aug 2021 18:51:56 +0200
Subject: [PATCH 144/904] fetchmail: update to 6.4.21.

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

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From e553a8a8ad5f1dbf25da821a705ef2e01852aa75 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:44:32 +0200
Subject: [PATCH 145/904] psiconv: remove package

* upstream is dead, distfiles are not available
* depends on libmagick6
---
 srcpkgs/psiconv-devel             |  1 -
 srcpkgs/psiconv/template          | 28 ----------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template

diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 78ba7731cc3e..566536002191 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -229,6 +229,7 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4

From 6c586f3296fcf5169f7cefcc650e852f9bd54035 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jul 2021 10:48:46 +0200
Subject: [PATCH 146/904] meson: update to 0.58.2

---
 .../dont-use-native-pkgconfig-for-gir.patch   | 11 ---
 srcpkgs/meson/patches/fix-unittest.patch      | 77 -------------------
 srcpkgs/meson/template                        |  7 +-
 3 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch

diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From c2ba9e7767c1ea8b3dbb45390158009777194b03 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 9 Aug 2021 04:03:16 +0300
Subject: [PATCH 147/904] vale: update to 2.10.4.

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

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE

From 6e82325b4c7dbb3f0f7eb41073859c63053774ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 14:14:18 +0200
Subject: [PATCH 148/904] goxel: update to 0.10.8.

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

diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 33184a59f59f6b4032928208c16a73093b75d1e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 15:02:41 +0200
Subject: [PATCH 149/904] clazy: update to 1.10.

---
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ++++++++++++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 -----
 srcpkgs/clazy/template                        |  11 +-
 3 files changed, 370 insertions(+), 93 deletions(-)
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch

diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d

From fef86a7cd110d646cd8778fd568eea8c4aef598e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 Aug 2021 20:13:14 +0200
Subject: [PATCH 150/904] lagrange: update to 1.6.2.

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

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..15992e57dbaa 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=b67b0c0e95c221f5afcd0f4d81c1130401adbbdfc802761bbf012e478b720767
 
 post_install() {
 	vlicense LICENSE.md

From eb12878bb7c6c3620bf0dd0593b373ccfecd6d3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 23:24:06 +0200
Subject: [PATCH 151/904] knewstuff: add missing dependencies

closes #703
---
 srcpkgs/knewstuff/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..156fa1a0102b 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,11 +1,12 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
 version=5.84.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"

From cce445b23dcd6b8bab91d2664ae4e63aecf029b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 23:24:47 +0200
Subject: [PATCH 152/904] yakuake: add missing dependency

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

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..61d6e2e645c4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,10 +1,11 @@
 # Template file for 'yakuake'
 pkgname=yakuake
 version=21.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"

From 5dee16ef6c59e9aa4ad3ecaa76d2837c762f05c8 Mon Sep 17 00:00:00 2001
From: ndgnuh <ndgnuh@protonmail.com>
Date: Sun, 8 Aug 2021 00:27:14 +0700
Subject: [PATCH 153/904] ibus-bamboo: update to 0.7.8.

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

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }

From 88a452dbda3063a5fbfb8fd1a4ba7e7e1aa377f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 10 Aug 2021 15:09:36 +0700
Subject: [PATCH 154/904] cozy: fix cross build with meson 0.57+

While we're at it, drop unnecessary makedepends, this is a python only
package after all.
---
 srcpkgs/cozy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 652ed886f3a9..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -4,9 +4,9 @@ version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"

From c03cfc877269487ef2d84047d383372eee2a51a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 10 Aug 2021 12:48:00 +0200
Subject: [PATCH 155/904] linux5.13: update to 5.13.9.

Set CONFIG_PTP_1588_CLOCK_KVM=m to remove a boot warning on non-VM boots.

Set CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y.
Set CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m, CONFIG_SND_SOC_RT1308=m.

Closes #30508.
---
 srcpkgs/linux5.13/files/i386-dotconfig   | 24 ++++++++++----------
 srcpkgs/linux5.13/files/x86_64-dotconfig | 28 +++++++++++++-----------
 srcpkgs/linux5.13/template               |  4 ++--
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 43a3f6aa16a6..2c8c80b9945f 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.8
+version=5.13.9
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- dfbaaf312cd69021fbe8ab597460aa961b8d2944efca35caa26b36fce43e616d"
+ 358da3bbe06ad323c4d0fec4fc8d755a07733ea69363101913fdd6056878113d"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 5efe8c9f4f23bafb113cfbc6e707dc39030d309d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 08:27:36 -0300
Subject: [PATCH 156/904] c-ares: update to 1.17.2.

Fixes CVE-2021-3672.

Also fix tests (locally).
---
 srcpkgs/c-ares/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}

From a68e77e4de52b0d1a2cac69c9bc98dbbac876402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 10 Aug 2021 10:09:34 +0200
Subject: [PATCH 157/904] crispy-doom: update to 5.10.2.

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

diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 

From 4cd7f6ca45df39146a742399675821b2d7abc34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 10 Aug 2021 09:53:42 +0200
Subject: [PATCH 158/904] doctl: update to 1.63.1.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0

From 931f9195fd1f7426e0af71bb166a753fc4fc4915 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 10:34:01 +0300
Subject: [PATCH 159/904] thefuck: update to 3.31.

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

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {

From e6d1a802904a677495095619ab16953b61631e38 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 16:46:29 +0200
Subject: [PATCH 160/904] piper: update to 0.6.

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

diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi

From 9e76f5cb75da1d30ffab5cf30a5492491ee4ef46 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 17:32:15 +0200
Subject: [PATCH 161/904] sfeed: update to 1.0.

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

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 9f3d23098319..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.25
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=a3d4a95bd660b6df4b7adaaecc7438fdb8ddd390b5d7e13fd14c2aeae1e2220a
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE

From 2411686b63e3600d1076182dda62434d5aa4b540 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 17:33:47 +0200
Subject: [PATCH 162/904] sfeed_curses: update to 1.0.

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

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index 148f3d67f824..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.13
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=49f467dd6c511b2e4dbbb198beada51cccee0026ba4dc8b88bd46f833ea74130
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE

From 6eb5bac61e7cbbf58c552fd4c2a347806b4049de Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:10:39 +0300
Subject: [PATCH 163/904] broot: update to 1.6.3.

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

diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 234d48c4d2b6e2bdff65bc4977d6aca34fd9c877 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 8 Aug 2021 13:46:14 +0200
Subject: [PATCH 164/904] micro: update to 2.0.10.

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

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE

From 465c57fd5ca01a66870a9f203b453cc68d987857 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 8 Aug 2021 14:06:21 +0200
Subject: [PATCH 165/904] swaybg: update to 1.1.

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

diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE

From e460eb8522597471ef6fb694545ab07712ad19c5 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 8 Aug 2021 23:52:29 -0500
Subject: [PATCH 166/904] haproxy: enable hitless reloads

Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
---
 srcpkgs/haproxy/files/haproxy.cfg | 1 +
 srcpkgs/haproxy/files/haproxy/run | 2 +-
 srcpkgs/haproxy/template          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..c155186f100d 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.4.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"

From 7f6c6b86ca3a8f3574caaa3280b1c7b9d78df566 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 17 Jun 2021 11:06:52 +0200
Subject: [PATCH 167/904] noise-repellent: update to 0.1.5.

Add patch made by ericonr to fix cross compilation.
---
 .../noise-repellent/patches/fix-cross.patch   | 28 +++++++++++++++++++
 srcpkgs/noise-repellent/template              |  6 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch

diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae

From 626f0352b497ca2bcf383734289ded15f914d7b0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:40:12 +0200
Subject: [PATCH 168/904] New package: libgnt-2.14.2.

---
 srcpkgs/libgnt                        |   1 -
 srcpkgs/libgnt-devel                  |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff | 130 ++++++++++++++++++++++++++
 srcpkgs/libgnt/template               |  31 ++++++
 4 files changed, 162 insertions(+), 2 deletions(-)
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template

diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}

From 728cb02bf9bdc273524a8a35264259d53e50c308 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:42:14 +0200
Subject: [PATCH 169/904] pidgin: update to 2.14.6.

---
 .../patches/01-configure_ac-libnm_pc.patch    | 11 -------
 .../patches/02-libpurple-nm_state.patch       | 19 ------------
 srcpkgs/pidgin/template                       | 30 +++++--------------
 3 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch

diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {

From 8a3bc83a6583ea3761a97a4f4a65716417225855 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 10 Aug 2021 19:00:57 +0200
Subject: [PATCH 170/904] ugdb: fix build on platforms without 64-bit atomics

---
 srcpkgs/ugdb/patches/atomicu64.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch

diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 

From bdd87c3ac872af272c26a4b2821c8ef077c10dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 14:10:41 -0300
Subject: [PATCH 171/904] srcpkgs/: touch new packages for the builders.

aarch64* repos are missing some.
---
 srcpkgs/libadwaita/template                | 2 +-
 srcpkgs/python3-pytest-httpserver/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index cb23b656c004..6b49f233b3ec 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -3,7 +3,7 @@ pkgname=libadwaita
 version=1.0.0alpha2
 revision=1
 _ver=1.0.0-alpha.2
-wrksrc="$pkgname-$_ver"
+wrksrc="$pkgname-${_ver}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index d866ff71c6df..12afe88ffe07 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -2,7 +2,7 @@
 pkgname=python3-pytest-httpserver
 version=1.0.1
 revision=1
-wrksrc="pytest-httpserver-${version}"
+wrksrc=pytest-httpserver-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pytest python3-Werkzeug"

From 509e8592ec1f06d54f113bf5632c1752d57391e8 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 10 Aug 2021 17:59:01 +0200
Subject: [PATCH 172/904] cmus: orphan

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

diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"

From 7970fd9d79581ecc0e0b69ad98401e8681ca5312 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Tue, 10 Aug 2021 10:21:49 -0400
Subject: [PATCH 173/904] synapse: update to 1.40.0

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index b45f32817bdf..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.39.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=36b5949f3a989a52efb8ba7d9ca0f71cd13eea1a1cd0048756e2309c143dec53
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 94aa9e6c095e80cee85ff96746e601dc89cba80c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 20:01:53 +0300
Subject: [PATCH 174/904] fstrm: update to 0.6.1.

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

diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi

From 81c7fd2afcbc73950bbb2bf1eb1065466143c97d Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 1 Aug 2021 17:04:00 +1000
Subject: [PATCH 175/904] xdg-utils: xdg-screensaver needs xset

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

diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 

From 38d5b608051a2d6a81134d0eed3b84797759fa16 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sat, 31 Jul 2021 09:26:45 -0400
Subject: [PATCH 176/904] dolphin-emu: update to 5.0.14790.

---
 .../dolphin-emu/patches/VkDeviceMemory.patch  | 37 -------------------
 srcpkgs/dolphin-emu/template                  | 20 +++++++---
 2 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch

diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }

From 1fc3a65cfd2d93972b50f4b324d545769a0c4e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Tue, 10 Aug 2021 00:19:56 +0200
Subject: [PATCH 177/904] New package: alsa_rnnoise-1.0_1

Closes #29409
---
 srcpkgs/alsa_rnnoise/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/alsa_rnnoise/template

diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d

From 98024ea74dbd1ae330d3ee4b6cef8c18932846a4 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Tue, 10 Aug 2021 19:23:15 +0100
Subject: [PATCH 178/904] font-iosevka: update to 9.0.1.

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

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..1388c2af3ccd 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=9.0.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+df3a4b213241d76868a559be72a7a1828892503bb2fa21453584439dae77d620
+be88b5bc4ff6484817df71b1f6bc87adf56d9c050dfa1b75c9014d1e791b7b5d"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 8379fea8c4a56838b04ac5c2cd486f546485dab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 31 Jul 2021 15:22:09 +0200
Subject: [PATCH 179/904] podman: update to 3.2.3.

By ericonr:
- remove INSTALL.msg, it's been 4 months since the change
- add changelog
---
 srcpkgs/podman/INSTALL.msg | 15 ---------------
 srcpkgs/podman/template    |  5 +++--
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/podman/INSTALL.msg

diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 10bba71de167805eb6392c64a27aa651788348de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:51:28 -0300
Subject: [PATCH 180/904] rustup: remove INSTALL.msg.

Anyone who finds the file under /usr/share/doc will be using
`xbps-query -f` to list package contents, so they might just as well see
the only executable in the package.
---
 srcpkgs/rustup/INSTALL.msg | 1 -
 srcpkgs/rustup/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/rustup/INSTALL.msg

diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo

From 9be5a4c59a6eb01e236d2c2284c8a37199f6b129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:54:06 -0300
Subject: [PATCH 181/904] qt5ct: remove INSTALL.msg.

---
 srcpkgs/qt5ct/INSTALL.msg | 1 -
 srcpkgs/qt5ct/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg

diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index b0a5d19b3cba..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
 version=1.3
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"

From 22e8f9e8cae46fa7df0e1c376801f6b7043a1b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:55:12 -0300
Subject: [PATCH 182/904] git-lfs: remove INSTALL.msg.

Man page shows installation in EXAMPLES.
---
 srcpkgs/git-lfs/INSTALL.msg | 1 -
 srcpkgs/git-lfs/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg

diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"

From 42a232586b809ec679a33465a64235e828b0f555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 16 Jun 2021 23:52:24 -0300
Subject: [PATCH 183/904] python3-docutils: update to 0.17.1, remove
 python-docutils.

---
 .../python-docutils/patches/test-import.patch | 20 ------
 srcpkgs/python-docutils/template              | 62 -------------------
 srcpkgs/python3-docutils                      |  1 -
 srcpkgs/python3-docutils/template             | 39 ++++++++++++
 4 files changed, 39 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template

diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}

From 6eec80526023309b3a9bc0fe8255159fae7fb7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 16 Jun 2021 23:53:05 -0300
Subject: [PATCH 184/904] removed-packages: add python-docutils.

We ship only python3-docutils now.
---
 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 566536002191..fa919b6de59b 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=47
+revision=48
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -234,6 +234,7 @@ replaces="
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2

From 3d320cfdbfae37e08354b2ceccae81ab421afc55 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 10 Aug 2021 16:21:28 -0500
Subject: [PATCH 185/904] nvidia: update to 470.63.01.

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

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 9c022ef65649..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
-revision=2
+version=470.63.01
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From 848eb7575796dc815c41beb714a9facb23b79125 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 Aug 2021 21:44:56 +0200
Subject: [PATCH 186/904] catgirl: update to 1.9.

---
 srcpkgs/catgirl/patches/add-missing-include.patch | 10 ++++++++++
 srcpkgs/catgirl/template                          |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch

diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0

From 022513d93211273cde83432041b18376c23081cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 28 Jul 2021 01:38:42 -0300
Subject: [PATCH 187/904] rpi-kernel: update to 5.10.52.

- document how we pick the commit to be used
- fix header installations so dkms works; based on fixes to mainline
  kernel packages

In this update, we are using the commit from
https://github.com/raspberrypi/linux/releases/tag/1.20210727
---
 srcpkgs/rpi-kernel/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 5a49056e98925660d2d66a3acaa2fa798576bd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 11:42:39 -0300
Subject: [PATCH 188/904] rpi2-kernel: update to 5.10.52.

---
 srcpkgs/rpi2-kernel/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 3d22b7caade50d7166c659c8cea16b3745f86c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 11:42:20 -0300
Subject: [PATCH 189/904] rpi3-kernel: update to 5.10.52.

---
 srcpkgs/rpi3-kernel/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 40347393c66053dbba4670917bb9f82d2c99d700 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 4 Aug 2021 10:18:40 -0400
Subject: [PATCH 190/904] rpi4-kernel: update to 5.10.52.

---
 srcpkgs/rpi4-kernel/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From ced831afd02954e50e6f4b40004ee24bd89b0bb8 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 21:39:19 -0500
Subject: [PATCH 191/904] nomad: update to 1.1.3

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

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;

From ed33dbb19f9be0996fff4ae34d65977160f83d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:44:50 -0300
Subject: [PATCH 192/904] mdBook: update to 0.4.12.

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

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 49e3264c70be..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.11
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=a66b57a2a70fbc8c665898bf952a7f8276e6f400c2d9340dbfd70ddb96b3562e
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE

From 0c0e204de8a7a62ac04e62de4e4c90bcf68ad4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:44:53 -0300
Subject: [PATCH 193/904] qbittorrent: update to 4.3.7.

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

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}

From 94ce362db34bd830e9183c2bcebe2ca2322e9f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:58:40 -0300
Subject: [PATCH 194/904] gzdoom: update to 4.6.1.

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

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes

From 4b42c5620cbcc6d17ca6fa8d7333372518d6bd82 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 5 Jan 2021 00:16:17 +0100
Subject: [PATCH 195/904] octave: update to 6.3.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add support for targets without proper openblas support
- add changelog for the 6.x release series
- fix gui deps
- adding 'texlive-dvi' and 'tar' to depends to make building external
  packages easier was considered, but ultimately dismissed; since they
  aren't enough to actually build packages, they would increase
  dependency count for little gain

Co-authored-by: Érico Nogueira <erico.erc@gmail.com>
---
 srcpkgs/octave/template | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")

From 792c9aa4dc4474554678a7df97f1d96a5905205f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 23:05:48 -0500
Subject: [PATCH 196/904] consul: update to 1.10.1.

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

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE

From a3d1632333bbc9d59136b7c7bfd5c564cf3b5b01 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 23:13:16 -0500
Subject: [PATCH 197/904] vault: update to 1.8.1.

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

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"

From 60870dbad7085794d9a9ef749ea2c070f35127dd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Aug 2021 14:30:04 +0200
Subject: [PATCH 198/904] iputils: update to 20210722.

---
 srcpkgs/iputils/template | 6 +++---
 srcpkgs/iputils/update   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/iputils/update

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'

From 40eb844da8c3dee9a1e882131be43283987fb8ad Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 11 Aug 2021 16:13:05 +0200
Subject: [PATCH 199/904] byacc: fix checksum

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

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index e987a97cce79..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f3b0edd584a426da0ee1676e4ed7484e62f777c31ea33acf4c89d65e32c75cea
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 7c9887f35adbf456bab5b6282626db6396c57df1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:10:40 +0200
Subject: [PATCH 200/904] icu: update to 69.1.

---
 common/shlibs        | 12 ++++++------
 srcpkgs/icu/template |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 278d2456072f..8d1e95f063ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..a05d0a7d35a8 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,20 +2,21 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
-revision=2
+version=69.1
+revision=1
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"

From c3f48be8ced108fbf7d3a5ccfdb8260c2da30ad6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:19 +0200
Subject: [PATCH 201/904] OpenRCT2: rebuild for icu-69.1

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

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 761da7f1e580..8eeb3f75b528 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -6,7 +6,7 @@ _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
 version=0.3.4.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}

From 56b5cc4bdf14c470a9b218eab763f6bc6531e437 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 202/904] R: rebuild for icu-69.1

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

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack

From 5736e4054a5d908bcb01e40e4864596492b6cf4b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 203/904] an: rebuild for icu-69.1

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

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"

From 7fbf19aa6e53df8ae08cfa583307ff980be03303 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 204/904] boost: rebuild for icu-69.1

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

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"

From 56b67896ba6369b304872445d1f85def11bdb238 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 205/904] brltty: rebuild for icu-69.1

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

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"

From e94edcdaccc740865ee47361c5b8a18dbe66f833 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 206/904] calibre: rebuild for icu-69.1

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From ce3b2180a475eab5191838c6969aa0dcac261f05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 207/904] clamav: rebuild for icu-69.1

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

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 60fbcd7225d5492acb6e5cae6120b75510304be8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 208/904] darktable: rebuild for icu-69.1

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

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 42f21f23a583ae91843ae9e2506894ef1c2f8e6d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 209/904] dino: rebuild for icu-69.1

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

diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja

From e1fe813c1841d760cd49cee7885639712541e251 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 210/904] dwdiff: rebuild for icu-69.1

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

diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"

From c9016fa369b8be9993bacee27ecb0ccc6ac468c5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 211/904] enchant2: rebuild for icu-69.1

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

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..59413b958747 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;

From d7b112a3f9486ae8f77330e1a312db9c123e0e4c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 212/904] evolution-data-server: rebuild for icu-69.1

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF

From dff02a83e5cb67acf9f422b808256870276f5d65 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 213/904] firefox: update to 91.0, rebuild for icu-69.1

---
 srcpkgs/firefox/patches/lto-thin.patch | 19 +++++++++++++++++++
 srcpkgs/firefox/template               |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch

diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 08c8efadf2d9..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 

From 0cc02d57ba4ab4d9ca08924889654086dd8330f8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 214/904] firefox-esr: update to 78.13.0, rebuild for icu-69.1

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

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 

From 084f35651139d35a603a7093c577d8ffff70aa51 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 215/904] freshplayerplugin: rebuild for icu-69.1

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

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 81bd48cc2b54c23209b0edf45c6d9a6887192978 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 216/904] geary: rebuild for icu-69.1

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

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 3891e7190112..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=40.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"

From b13eca6dc2acc30bad3f7fa8bdfc67e449dc0c9f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 217/904] gnucash: rebuild for icu-69.1

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

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check

From 4bcb77d586a35c93a9cdc07000332fe4571518be Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 218/904] gnustep-base: rebuild for icu-69.1

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

diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel

From 9d8cd9181eb2aed3b3635957b2838646a462c9ff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 219/904] gnustep-gui: rebuild for icu-69.1

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

diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel

From d9ab891999d04792b5f1b53bb23e4f31e41d93b0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 220/904] harfbuzz: rebuild for icu-69.1

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

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 106a44ff3139..6964948610fa 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
 version=2.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled

From f9cf2a7a8c5c5dfb56fefb34d921558a198ace56 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 221/904] icu4lua: rebuild for icu-69.1

---
 srcpkgs/icu4lua/patches/icu-68.patch | 94 ++++++++++++++++++++++++++++
 srcpkgs/icu4lua/template             |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch

diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"

From bc84b28f628d60dcb6eacc54cee6bfea2c46b7c6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 222/904] imv: rebuild for icu-69.1

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

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 608cc8790641..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel

From 28a9b311cdef4f7b64fb7cc6ae2d71e4dec4b7c5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 223/904] kdb: rebuild for icu-69.1

---
 srcpkgs/kdb/patches/kdb-fix-build.patch    | 67 ++++++++++++++++++++++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch | 33 +++++++++++
 srcpkgs/kdb/template                       |  2 +-
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch

diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 7933a3af8ee0e5078c09c7d7cd191995b1aa2c05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 224/904] kiwix-lib: rebuild for icu-69.1

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

diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then

From 301dca75b3177ed6657057b5c2fccb5b762eb480 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 225/904] libbitcoin-blockchain: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 7df152801570bb9dbc6d1e166e3cbf1e941f7ed3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 226/904] libbitcoin-client: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"

From 5a8b70a41ed30c4b043920428587c4ba5bdff7e5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 227/904] libbitcoin-database: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From b4a9817e9ae3c926fce58d9633ea0e2046fa075d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 228/904] libbitcoin-explorer: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From b78c4009ab9a40121dde74707ec2017b86d40525 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 229/904] libbitcoin-network: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From f4eaacb5ce1cb3d1413b3ac65b1cee324697c1ee Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 230/904] libbitcoin-node: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From 76daa38a02695ce70f4fe0f3dc4c44199c22c314 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 231/904] libbitcoin-protocol: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 9606508ba8c9873d742519ab60b31d42cb1ee0c6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 232/904] libbitcoin-server: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From 2d8f3e776a7e447c1a2aa56fcd5346e67af6ee8e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 233/904] libbitcoin-system: rebuild for icu-69.1

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

diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png

From ffa8b0c09b3ebd7dcd932e05bb7de05185365689 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 234/904] libcdr: rebuild for icu-69.1

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

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"

From 59439e603d7d1c6ba888d6d702e33c050f51ce42 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 235/904] libe-book: rebuild for icu-69.1

---
 srcpkgs/libe-book/patches/icu-68.patch | 20 ++++++++++++++++++++
 srcpkgs/libe-book/template             |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch

diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"

From 4a8ff67faa44a8cb3e593e4e4b4b396f77cfc427 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 236/904] libgdal: rebuild for icu-69.1

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From b78ba3856f12e94c9afd379a47b149055662886d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 237/904] libical: update to 3.0.10, rebuild for icu-69.1

---
 srcpkgs/libical/patches/fix-cross.patch | 58 +++++++++++++++++++------
 srcpkgs/libical/template                |  7 ++-
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"

From d233af216dfb3eba0f7b797213233f6f071dea37 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 238/904] liblcf: rebuild for icu-69.1

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

diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"

From 8ce734ac810efdaa090803f5c3a42207f3f40aee Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 239/904] libmspub: rebuild for icu-69.1

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

diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"

From 70020b93867872c08bb9a2e10699d1f5ec4ced05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 240/904] libpsl: rebuild for icu-69.1

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

diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"

From c0a65143f42a1d7246347e16cb4a6488d927a87a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 241/904] libqxp: rebuild for icu-69.1

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

diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"

From 4ee9f50e3fc488b845319eb9a53bb80d70b345a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 242/904] libreoffice: rebuild for icu-69.1

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

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 02da22f93bd6044d44a50b15fdd348775a806e8c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 243/904] libvisio: rebuild for icu-69.1

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

diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"

From 37eed4299fb3b5dfc26faa8a1909f13f37cc3553 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 244/904] libxml2: rebuild for icu-69.1

---
 srcpkgs/libxml2/patches/icu-68.patch | 25 +++++++++++++++++++++++++
 srcpkgs/libxml2/template             |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch

diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"

From 64cc847ebe30f64de477e48b29c35d171500cd2f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 245/904] libzim: rebuild for icu-69.1

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

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)

From 193cc32626f0df1a239e4530a2706dd6e0dd64f7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 246/904] maim: rebuild for icu-69.1

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

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From eb26dc32882c5151474ff6c157200785c9b39269 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 247/904] modsecurity: rebuild for icu-69.1

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

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"

From df2efea9b9876b15af7d43a5f353254316973e0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 248/904] mozjs78: rebuild for icu-69.1

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

diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 4abbcd0e63719ebba21307a11d9f8a744f49b666 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 249/904] ncmpcpp: rebuild for icu-69.1

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

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"

From 2f4a6301e4354d4561467a292057132a7e2b4d15 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 250/904] nodejs: rebuild for icu-69.1

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

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel

From 1e3b663e40a91288c1547a37fd1ae0e2c587afed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 251/904] nodejs-lts: update to 12.22.4, rebuild for icu-69.1

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

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From ac09d0ee37b7727312e3f33a663ffe8d7037adb2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 252/904] nodejs-lts-10: remove

---
 srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ---
 srcpkgs/nodejs-lts-10/patches/ppc32.patch   | 29 -------
 srcpkgs/nodejs-lts-10/patches/ppc64.patch   | 41 ---------
 srcpkgs/nodejs-lts-10/template              | 96 ---------------------
 srcpkgs/nodejs-lts-10/update                |  2 -
 5 files changed, 182 deletions(-)
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update

diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"

From e87dbef856562b53769b14bae399bde92e63b7c4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 253/904] nuspell: rebuild for icu-69.1

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

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"

From cf11016d4e7694f9c5d84d0c86e45fd04edf20fb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 254/904] openttd: rebuild for icu-69.1

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

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes

From c2aa61f2d63023d150f429efad2bca57c000737b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 255/904] peaclock: rebuild for icu-69.1

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

diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"

From 251eacec946400401a14b0d7c9400a06e2e6c20a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 256/904] perl-XML-LibXML: rebuild for icu-69.1

---
 srcpkgs/perl-XML-LibXML/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From 811b4e6da7020880121e41f6266f1eb9c7d53f8b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 257/904] php: rebuild for icu-69.1

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

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 495d78f2b1d7f1fc561bfe691094bf3947ce2c52 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 258/904] poedit: rebuild for icu-69.1

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

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"

From 2b96d33cf4dcdbaf3a98685490ea6d41d58aec01 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 259/904] postfix: rebuild for icu-69.1

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

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 4dc1b9e5dad8..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.6.2
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From b7aafad34cb6c6ae82d2cf066726fffef21ed054 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 260/904] python3-PyICU: rebuild for icu-69.1

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

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 43648162f5a3dffc0f1904e81cc3d4e7eb91e9cf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 261/904] qalculate: rebuild for icu-69.1

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

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 4d9e490bf26d..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -3,7 +3,7 @@
 # and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
-revision=1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"

From f88d31cce5d6df9a419a31c8423db9518061a430 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 262/904] qt5: rebuild for icu-69.1

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

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..ca47cb6952b4 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From fef7cbf57d926e4df8ead01ba0eb6d463df045e0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 263/904] qt5-webkit: rebuild for icu-69.1

---
 srcpkgs/qt5-webkit/patches/glib-2.68.patch |  26 ++++
 srcpkgs/qt5-webkit/patches/icu-68.patch    | 170 +++++++++++++++++++++
 srcpkgs/qt5-webkit/template                |   2 +-
 3 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch

diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"

From 3386e4934da42bb712904e6b2e0b6fbe7f63477a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 264/904] qt6-base: rebuild for icu-69.1

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

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..d877eeb9b3a3 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6

From 1d68de56cd120b4198bd32c7297cc6e16c013fff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 265/904] qt6-qt5compat: rebuild for icu-69.1

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

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "

From bfc324c2d6d071c76a719381aa54c059844498fc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 266/904] rspamd: rebuild for icu-69.1

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

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From b6f02671f0da96b186b906cca35dd2921f7fcc12 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 267/904] scribus: rebuild for icu-69.1

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

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"

From 92afc87dec9e517501ae29fc39763763592dd5b9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 268/904] sile: rebuild for icu-69.1

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

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat

From 3257a2f83475819aef3c785c2fb27b277ae0ebf5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 269/904] slop: rebuild for icu-69.1

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

diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"

From fc055d40ef8b69223e134281798e2be37ed6b013 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 270/904] sword: rebuild for icu-69.1

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

diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"

From 2f29ac301c7e8115ce57231bbee8c7e2b91c27b0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 271/904] tectonic: rebuild for icu-69.1

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

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"

From 66c77cbb0e30e0331ae40f14627cabaff50e5f6b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 272/904] tepl: rebuild for icu-69.1

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

diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"

From 66ccb66f0b1a2e3cb9ce21413f817a34f1e9aaf8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 273/904] tesseract-ocr: rebuild for icu-69.1

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

diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure

From a8b163ba97d9f1915c61d37ce0c50e792a7df353 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 274/904] texlive: rebuild for icu-69.1

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

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure

From 47ac336500455e913135aa3a9b5f280b32426c41 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 275/904] thunderbird: update to 78.13.0, rebuild for icu-69.1

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

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 

From 8b5c5db9cf1e4d19dc0d8cb3deb46460425e7806 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 276/904] tracker: rebuild for icu-69.1

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

diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false

From dd24493db4b90bf6f81e1bf36bce6e1592704f2c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 277/904] tracker-miners: rebuild for icu-69.1

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

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From 1b2c9de037c34573212eb7072b9bcda928d2dc59 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 278/904] tracker3: rebuild for icu-69.1

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

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"

From 7fd2780e7c9fc39cf67a0df641cd427871b64a9a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 279/904] tracker3-miners: rebuild for icu-69.1

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss

From c2ca40e3b0b383d7d003e59e2abfbbf354449995 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 280/904] unar: rebuild for icu-69.1

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

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile

From f1c1a3a16b5f9d404607bb9d8f2942cc045242f6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 281/904] vte3: rebuild for icu-69.1

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

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"

From 9996281dfc6b515c735f872c30edfbab58b5c289 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 282/904] webkit2gtk: rebuild for icu-69.1

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

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..bbe0d8ddca86 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"

From f24ca68118fe616cb14a799eab987e5fe2a50d1e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 283/904] widelands: rebuild for icu-69.1

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

diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include

From 6a0ae332c8b3e2db24c542bc17675fc021c18fc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 284/904] xerces-c: rebuild for icu-69.1

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

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"

From d2e4ca8ce3aba602986c6e98c231feabb89b0f63 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 285/904] yaz: rebuild for icu-69.1

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

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"

From ab8a3e26c6b37a71f049b4d12c894bcc193bf18e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 286/904] znc: rebuild for icu-69.1

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

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python

From 9a564f46168a54a2604962f7dff25142f16270e3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:57:08 +0200
Subject: [PATCH 287/904] removed-packages: drop nodejs-lts-10

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fa919b6de59b..cf88a864cba9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,7 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 698da90c3ce28488cb1d77a3ff6771e21f2d0827 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 15:01:15 +0200
Subject: [PATCH 288/904] rstudio: switch nodejs-lts

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

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel

From 13dec251a9280f1e08c6c3155c14f9398386fa46 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:08:27 +0200
Subject: [PATCH 289/904] firefox-esr-i18n: update to 78.13.0.

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"

From a93c87fdd42268d10b0777ba9296b8407b679fe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 23 Jun 2021 19:10:39 +0200
Subject: [PATCH 290/904] qt5-webengine: update to 5.15.5, rebuild for icu-69.1

---
 .../patches/0120-QTBUG-91773.patch            | 372 ------------------
 .../0200-invalidate-old-v8-cache.patch        |  31 --
 srcpkgs/qt5-webengine/template                |  16 +-
 3 files changed, 9 insertions(+), 410 deletions(-)
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch

diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"

From 1dd9efd77e235d400e74ca4f9502507a9ff645bd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:51:45 +0200
Subject: [PATCH 291/904] firefox-i18n: update to 91.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 755b02d248c0..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0.1
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="be357100c3fbdc0e0568985f0966d7080f6d489668300e9cb912bce70f7b8293
- 71667a2ea1a9f7f1fa8d7c1a61206cb2a84e61e5a3995f8ad039f4431dc9ca30
- a628f511eefdb40474f8b5c27fc8e25e0dcece7395552f68da444dc511d1fa25
- 67426fc4cdfdb18d97c4f0bfc54cd7a54341bc82177d977d798af8a8f33a6883
- ea6d961aec4c22758cab21aa42ce9544a20c333f320d7dce26707ad29df67ee2
- 9abb4464f9a0335a2d78b9f951309ce88f4727b0b15aa127d1bf983f034ccc76
- d2b67203c26292632b27b19c894d1980b1bf6e5540153360351ee70cf4545fd9
- ff0b5045589e866527df3240dd1207c14d4b11aa3764c9d7d8d4a92ef125bb21
- 17068cd81a7a223da2debab9da6fe4ca84463570931952c8269f2607b14e96fa
- ae8b28dfa5d73fed65c21a4c392eaa165fd608610d91ba8ec03c33036c47709f
- 423cbcc21ac9a21985deeea320dbac657696edc097769dc66b87ce5a20cb0b31
- 75eb76024a29b35ef5e7672d71769463b39b533ce018ce20da2097bb9744c8c8
- 0fa00a2a922b630594e0b94c8da46f7c5884bdf138dd6cca6dc8eb828bd1e2d7
- 34bd621a31da5e7ba2f887bea936e6c0ebceb4229badfd1fa1478776b2140d14
- bdd083ef2797c6cfbfb898ec1416f7f4cc5a5874bd4cc59ee857c82fda7df258
- 0e47f9c1891802657f00bb9c1d591fa5856da9af118e1e5b6cffcb59d94d496b
- e92252b9a1a3459f0da78556b24a64b181a3b2817cf3a8f0be8341b73c871ea4
- cc60e2252d84fb8440284a0e856f8a902220dfc63d0e8b126b2f42c55306b21b
- 49891d321639b35e151203bd232fd9e72f0c9683d1bea6f1a7c401d7a3a04a76
- df3545107af7b4bc032ef4c9fc7d3c435fb93054901abdb6fc4939d47aa764c6
- 4d6dada6f645dbc618d8376ee60a8eeecf437bd18ea0785595d1e201a8e8c5be
- 3172dea2525652c8094bde33f4f38983dbbe434ea27310e419c8f6e50a51975a
- cb25c27b81cd6760356a638e10816777cd9695e56ed95300018d35a7f53f0a77
- dbd688b662c519a1a3cc51067b76cd7640951d4b2fa99c8fd6a423ee58f9cf09
- 53e4198abf07adf3ccd626e6a34f532a80b60692182fc01d7bc3e420c119f7d2
- 2bc5e3b5b1ceb1126737ccd5c9c6e26dab77276d748ec4a0761d105515580151
- 9f7c502604bbd252a3ab256e8397e8757931310c57421577b7da511cd27c18af
- c115f32dc9c7b7d24a23defeaf78653ca7265428ef402994250d135905252b1c
- b9efc308fe8cac9a6015cf40b41e20207d9485bc8ba4a62773212594ce797f84
- 53295a0504e883b7b0cf6a7522ad61f58cbd23229ac0e7387366f4e57293f08b
- 83147e937209d97e8f980da4e12a09ba920665767dfe9f272abb2c485f00e904
- b2bd15e6782afa19c681d6083f6d528463d6ef74d55b7ccebe44e6ffbe2730f5
- 89b2f2538528542a89d5eeb845ee97896ece7407ca9038ea4e7e1f0b0f548158
- e0a764400e86782734add3fa848726634212abb71e4e7f33553268a310344b72
- 16ce9e331f413623de20099d2f2874d735744a587a9a5db95ca95f1960600a12
- 04c2b912864dd90aaef379b09017f1273e25d7e1723bce748a7d0fc03d0c0663
- 89c0276d64185f10b442e2e31dadf2ce3bd8d09db95644467f325aad22f49a69
- e0ab2286ef9518ffcf9595c79918ff505d096d057d6372f6cfc9c2740727611c
- 77e2c1b72e73ed8c23390bc67fdd68602cb3bba74e3d91a7f74522eb933acb8c
- befaca21c9c962a62c1f568e7d2d68aefad4d63d8bbf985bd5ca761dcad898c8
- e133796f92b7a634e3353226aa2ea44f311cca6b0affcc89ec9308c71cd018ad
- 60e99cf8302b5e277bbb5866e0fe56d357a006a5cfbd68c5acbbf82ceef24920
- 5ad2ddac27a739798c15542450507b2485806607334c018d58583c2a0fb77f3f
- 2548b8d17504cd11c742d810b74c4ec4d17c3da57250bb8a178488924fb14f95
- ec33239e16abbe551cfa1c9908249cc2c333a16c3c1950ad2041ee9feb75ad77
- d7de6154454ff6d087ccd0a4a6471d2cf1f4b73b3821493db3ece8c1a461c037
- f4ed4ad50029e687a7b97c71fbfa6f16557b97c52a236f750c69dbcf8459ebc8
- 0afa21ba8c5ff99ecee2d6c8f348e4e82a7f1f7d13bf8b3fe0c505cad5513d62
- 97e36627e7bc58b6139b30e31b3e9e50dd8e67bad514fc058d6170559273197c
- db8a0b2d753f2591e9dbc0f1c71516e35ed0ee839a46596e4a7d5b4b8e002672
- a7a442bd6142272b7734479eb946219dd7fbf2be9986d55c045b01ac13988539
- d98ead55c776fee847fa259472b5a80254fb8e49c8e1df695da1ae0e46ec61da
- fbebbd39b2d84c663425c8e5b40bbdf8cb4df13d3a8db5fef07ed19fe6f790b8
- c37af09b2ca5fbdb025b115c7dbb5c68717f57a29b3d5403bcd7daf3e4d51818
- a8fe814f81cda0fe2b819c1185b0d131f5fdab6156b396cdcc4d1b323d0a0660
- a6e78737ca0ed0cde75e9b7bc18d85edb11493433f0de05294efbe1742a75b27
- c55b7f41c14c3ac0a8226351b72bfa5ce05f0648bf0bce96826363875132a121
- b7b76bcc2ffbc5aee2327982544957ee4ce49872587367ec17368fd4f7ff58ec
- 85c146b304153f0587669ce9d31299465e3b109be97f35c7698e77ea04d46ebc
- 0b09874b5d687b71929042ce95184bebc5ed026332e4d347c1ecde3f451f4a5c
- 480681ce041ef2c217091e8ec0e4c7a95e5d2fabb1c2e7a6c6bc47fb98dba980
- 8130ab6e8d3d5a644dba2ac67df0cb2124f29afc08c59fc8eb4222901a42ac50
- 36b1fbe2166c83d58d8c955678204bee18a41a8f4e3ccd5a8f12b3b3b5f6e4e1
- 1d8e864cbe155f1470bd360b4cad611e336036a5044060f673bf04305f40f03b
- 932bbdec41615f61a54495ff1d50b228a5be7702071e24159ce92dc4f237470a
- 09095e1472079ff4c8ba251b0cd247be56bfe3f72dcd86866182ec1797607a9f
- 76be304b42b5fbdefb4301f30884b7b0bae96259bc25d08dd2b4f63ea5d27185
- 6258fb53ab87bce22906957ffe71e4dd69fbc7b7bca23cf1d82098647d82a334
- 379e9ca71f8a40f4cb81d70ddfea3ec433451a8216ebe13d1773f6e7743e7aae
- a1a2e9a6733297e4c000f67b49fc79385525fd99df35c48b0670ae7ef071f0b1
- b90bdc875b93f6d78c1ec113b94a895e142d28836b27a57b44cc86e2f6b6dc88
- 18ea08e9f1f81555e5771e86bdd6652be4465a1c39b6d07895ed54de56eafc9a
- a66bc6dc460cf0e4c891a02192faff10fa772a64f3d260bec2d9e49487f4cde9
- a995381bff3f42b0f67d2e7d6f12871d7ae7e58869ce345f590ae80ccc174709
- cde46c5c7007ab3ba895d5e9b30ac6270837f5b48f393f9f752a24e03532a48b
- dc363a23c014d1a8bf24afa1e6cae0d0cba6bb6e0c3f933816f8debc38c622d2
- 2ee0f2492f81a12840d2c99a00ac1e3666f514d2654042e54f8c8e5bd211797c
- 6113eb31e48de4d7fdb439d9dbe319408e7dcbe3c55fbbf1a7c4c5449394b324
- 92df223930d3e39657f7705b6a75369b0b9ecc5988e5fabc4895b39a9718dbed
- b95a4d34d8c426e04ad6023cb2b9319c519576f4a851b82c03a1992f58f026bc
- 760dd2be7d150ecf5ceabee59f55da9be5cd2a0fc7eaf20f7afa92dfa3189273
- 5ab7c5a16857b53a333198656335672593f8d9b2920693420d90d1df0e7e13b0
- 68499f57731c926e8601cb138b0e03e0d8bdcd88757701b3bea46652d439245e
- 41d4ef32a4833f1ef9f849fafdf32ccd1833adab0696324658a64e38d54625a2
- 2ba6ea3e31364158af51554efdd13c4efdc5c665d868ef140274eac27c2e38c9
- c506b5af14c6ce5a46d5bd9b4e0875dae548202f1f3f1cca967322805e61545a
- f7b8b33efd41b69d9905f3da2277ca66a4f212efe99619f3eeb19d14ae835061
- e5fa0feb89a3418608812debf1445d952ab65d53d94d5ec4e9680224d0ba50d7
- e78dc38e67d3416e8319491399e432c7025b134ce7b195847e3de38d66f63852
- 9c6915607b0181f95ca43fd4266c6c4ede04010549c368f5bac6798b5dd70ea7
- 57ca390e904ad5e292e819b1fa3fdb35652c8b5196d1f52dd65a33b2a254914c
- 9028546203eedd44ec1dd08e33c0ab40be27988100f08c3e47b2a025b6b20cb0
- 8993f2b916a162e2e05be1e0b91d0f1e663a462e4363a3a867992c03ef7bc122
- 57bc6916b472fb843052794574b39a96b7f48698d88104522f9fc6a6b9f9e8bc
- 42d64b7a6a7f5cc5e76e78108066fff648681a574c3e2b6c34fea704e76c2499
- 3c9a52ca9f25a5040314b42f3cf14dd4be83b065ccda29e6998d21e85b0fb9cc"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"

From e8392bc575028e3e93504dc14c4a3b57eaa225e5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 292/904] 0ad: patch spidermonkey 78.6 for rust>=1.50, rebuild
 for icu-69.1.

Necessary in order to rebuild 0ad for libfmt.so.8.
---
 .../patches/spidermonkey-78.6-rust-1.50.patch | 107 ++++++++++++++++++
 srcpkgs/0ad/template                          |   2 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch

diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
new file mode 100644
index 000000000000..95007b32f25e
--- /dev/null
+++ b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
@@ -0,0 +1,107 @@
+From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001
+From: wraitii <wraitii@3db68df2-c116-0410-a063-a993310a9797>
+Date: Sat, 27 Feb 2021 09:31:17 +0000
+Subject: [PATCH] Patch SM78.6 for Rust 1.50
+
+Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
+(this fix is integrated in SM78.8)
+
+Reviewed By: s0600204
+
+Differential Revision: https://code.wildfiregames.com/D3590
+
+
+
+git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797
+---
+ libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++
+ libraries/source/spidermonkey/patch.sh        |  4 ++
+ 2 files changed, 69 insertions(+)
+ create mode 100644 libraries/source/spidermonkey/FixRust150.diff
+
+diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff
+new file mode 100644
+index 00000000000..cfb0d58b4a0
+--- /dev/null
++++ b/libraries/source/spidermonkey/FixRust150.diff
+@@ -0,0 +1,65 @@
++
++# HG changeset patch
++# User Emilio Cobos Álvarez <emilio@crisal.io>
++# Date 1609006565 0
++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
++# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
++
++Fixes errors like:
++
++  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
++
++I've left the most specific dependency, but for wgpu the rev is not
++right, so I've kept the branch which effectively preserves behavior.
++
++Differential Revision: https://phabricator.services.mozilla.com/D100485
++
++diff --git a/.cargo/config.in b/.cargo/config.in
++--- a/.cargo/config.in
+++++ b/.cargo/config.in
++@@ -1,16 +1,16 @@
++ # This file contains vendoring instructions for cargo.
++ # It was generated by `mach vendor rust`.
++ # Please do not edit.
++ 
++ [source."https://github.com/shravanrn/nix/"]
++-branch = "r0.13.1"
++ git = "https://github.com/shravanrn/nix/"
++ replace-with = "vendored-sources"
+++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ 
++ [source."https://github.com/mozilla/rkv"]
++ git = "https://github.com/mozilla/rkv"
++ replace-with = "vendored-sources"
++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
++ 
++ [source."https://github.com/mozilla/neqo"]
++ git = "https://github.com/mozilla/neqo"
++diff --git a/Cargo.lock b/Cargo.lock
++--- a/Cargo.lock
+++++ b/Cargo.lock
++@@ -3200,7 +3200,7 @@
++ [[package]]
++ name = "nix"
++ version = "0.13.1"
++-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ dependencies = [
++  "bitflags",
++  "cc",
++diff --git a/Cargo.toml b/Cargo.toml
++--- a/Cargo.toml
+++++ b/Cargo.toml
++@@ -60,8 +60,8 @@
++ [patch.crates-io]
++ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
++ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
++-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
++ # failure's backtrace feature might break our builds, see bug 1608157.
++ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++
+diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
+index 58be1fbdef0..879964b0f2e 100644
+--- a/libraries/source/spidermonkey/patch.sh
++++ b/libraries/source/spidermonkey/patch.sh
+@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
+ patch -p1 < ../FixRpiUnalignedFpAccess.diff
+ 
++# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
++# Note that this isn't quite the upstream patch to match our version.
++patch -p1 < ../FixRust150.diff
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)" = "FreeBSD" ];
+ then
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..f6e6b41899de 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.24b
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From a2431d7890b535150b19d34cf26e481bd750ad63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:08:09 -0300
Subject: [PATCH 293/904] R-cran-stringi: update to 1.7.3, rebuild for icu-69.1

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

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE

From 165586a4a9bb7ebe9aa4e3e9bb746a1afa72751c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 11 Aug 2021 15:12:39 +0200
Subject: [PATCH 294/904] thunderbird-i18n: update to 78.13.0.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"

From 69e658aaaded8f5ac4b9b4f64f76de2db71bf950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 11 Aug 2021 11:27:22 -0300
Subject: [PATCH 295/904] qt6-base: only add self to hostmakedepends for cross

Tools other than xbps-src might get confused and assume a build cycle,
even if xbps-src can deal with it.
---
 srcpkgs/qt6-base/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index d877eeb9b3a3..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"

From 5b8ad34edf1c6d829c004edefa4d4e603900e84a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 11 Aug 2021 16:36:26 +0200
Subject: [PATCH 296/904] nodejs-lts-10: remove stale symlink

---
 srcpkgs/nodejs-lts-10-devel | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/nodejs-lts-10-devel

diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file

From cf9419873c3af6ed93443452132dd30a0d37afc1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:04:04 +0200
Subject: [PATCH 297/904] ripright: build with imagemagick7

---
 srcpkgs/ripright/patches/imagemagick7.patch | 22 +++++++++++++++++++++
 srcpkgs/ripright/template                   | 14 ++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch

diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}

From dca2aff5e1294b8165e0d13e52f0ea549e5193e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Aug 2021 22:05:44 +0200
Subject: [PATCH 298/904] New package: hello-2.10

---
 srcpkgs/hello/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/hello/template

diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b

From 9a6a514263dc838f59b04fc416f99449c6fc9dff Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Thu, 15 Apr 2021 21:30:58 -0400
Subject: [PATCH 299/904] nginx: configure with dynamic module support

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

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \

From 0b8da62c87a4d37aabb46088a34f6b8577119591 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 11 Aug 2021 00:18:27 +0300
Subject: [PATCH 300/904] spdx-licenses-list: update to 3.14.

Also fix license (thanks @paper42).
---
 common/travis/license.lst           | 14 ++++++++++++++
 srcpkgs/spdx-licenses-list/template |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx

From 17288c1de746a9be11223f9641de353eb5d90f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 301/904] New package: CUnit-2.1.3

---
 srcpkgs/CUnit-devel    |  1 +
 srcpkgs/CUnit/template | 37 +++++++++++++++++++++++++++++++++++++
 srcpkgs/CUnit/update   |  1 +
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update

diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'

From dae1f7ed65311bde9262d0e201fb3e1d6e8ba917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 302/904] postgis: update to 3.1.3, enable unit tests

---
 srcpkgs/postgis/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From 8349d41a0037c64ad06d233c9294c34a2c6172b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 303/904] postgis-postgresql12: update to 3.1.3, enable unit
 tests

---
 srcpkgs/postgis-postgresql12/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From 6751c9c6b1c6ce60d6585c2b75cccb8daf583447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 304/904] postgis-postgresql13: update to 3.1.3, enable unit
 tests

---
 srcpkgs/postgis-postgresql13/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From 5eb7121cebdddfbb0d44f20a32d6ecbe6d018ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 305/904] mosquitto: enable tests

---
 srcpkgs/mosquitto/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }

From 18b5dcf0e6883135b706c715e0bab2092b746a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 Aug 2021 20:46:25 +0200
Subject: [PATCH 306/904] README.md: put chroot style information together,
 extend

---
 README.md | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 

From 350166976c722cd668a4bc224c525d5c846cfaf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 11 Aug 2021 14:33:40 +0200
Subject: [PATCH 307/904] intellij-idea-ultimate-edition: update to 2021.2.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)

From f90ae42c2aae7001bc3ebe5b21058c42ad5cae7f Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 12 Aug 2021 00:12:28 +0100
Subject: [PATCH 308/904] chezmoi: update to 2.1.5.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE

From a33ed32faf63d389336cf04e38d176740b8744ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 10:27:07 +0700
Subject: [PATCH 309/904] qt5: add libxml2-devel to makedepends

Trying to reorder cross-build.
Transitively dependencies via libxslt-devel.
---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index ca47cb6952b4..935a156b7d48 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel

From 19cdd62720eb90b76603b247dc6fdfa46b7659d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 10:27:07 +0700
Subject: [PATCH 310/904] qt5: add libxml2-devel to hostmakedepends

Trying to reorder cross-build.
Transitively dependencies via wayland-devel.
---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 935a156b7d48..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 

From a6dcf4818f41dc8e9914fbd5608e8937fe627c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:16:15 +0700
Subject: [PATCH 311/904] harfbuzz: makedepends+=libxml2

Force builder to use staging libxml2
---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 6964948610fa..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -7,7 +7,7 @@ build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"

From f43eccb162114e56f342ea90d8e6ffc60cd5f93f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:24:31 +0700
Subject: [PATCH 312/904] webkit2gtk: hostmakedepends+=libxml2-devel

See previous commit.
---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index bbe0d8ddca86..951c1c9ee5ee 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -21,7 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel

From 9552387562715d10d3a4ff957253fb7e8b6ab786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:31:19 +0700
Subject: [PATCH 313/904] webkit2gtk: hostmakedepend+=libpsl

Force libpsl from staging, (geoclue2->libsoup-gnome->libsoup->libpsl)
---
 srcpkgs/webkit2gtk/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 951c1c9ee5ee..837fd8130803 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel

From 957b5cf60371cec81e8568836ff63e84f040548e Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Wed, 11 Aug 2021 23:11:31 -0300
Subject: [PATCH 314/904] icewm: update to 2.7.0.

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

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 

From 92b8154124f3b99c7675e884ecb0906d6447053a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:17:08 +0400
Subject: [PATCH 315/904] osinfo-db: update to 20210809.

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

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From 7dd8e875b834a081010fd7693801a554d22ce593 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:25:10 +0400
Subject: [PATCH 316/904] benchmark: update to 1.5.6.

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

diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c969c75edb6e81b0c054969587386c1f0f9ceaaa Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:11:39 +0400
Subject: [PATCH 317/904] python3-regex: update to 2021.8.3.

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

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From ac2f0430df86b78c31f1f11c7077f8baa36c8034 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 11 Aug 2021 00:03:54 +0300
Subject: [PATCH 318/904] skype: update to 8.75.0.140.

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

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index d8e2f3a77606..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.74.0.152
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=1b19fbb55c75815c78e9c20ed29a97c6b11c8b45a2444dd8f1aa51d7ca354039
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 

From 0678caa7d2897dbd9e3b30e088262b15ca7fbec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 11 Aug 2021 22:46:55 -0300
Subject: [PATCH 319/904] ptii: remove package.

Distfiles were never available officially. The git repo in [1] still
works, but seems inactive, and the homepage no longer works.

[1] git://z3bra.org/ptii
---
 srcpkgs/ptii/patches/fix-installpaths.patch | 15 ---------------
 srcpkgs/ptii/template                       | 14 --------------
 srcpkgs/removed-packages/template           |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template

diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index cf88a864cba9..c9349197c278 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -230,6 +230,7 @@ replaces="
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
  psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4

From e1a46884dbe48d07b3e76b700260082755eca761 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 09:45:43 +0300
Subject: [PATCH 320/904] protontricks: update to 1.6.0.

---
 srcpkgs/protontricks/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}

From ae1554ac72c9946252b074c6016b37ae2eac2ed3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 9 Aug 2021 20:28:29 +0200
Subject: [PATCH 321/904] libfilezilla: update to 0.31.1.

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

diff --git a/common/shlibs b/common/shlibs
index 8d1e95f063ec..f96d3f36b3ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2588,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 4f09a230c238ebf65426fbeb1b1f403632760c8d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 16:29:47 +0200
Subject: [PATCH 322/904] filezilla: update to 3.55.1.

---
 srcpkgs/filezilla/patches/libtool_tag.patch | 11 -----------
 srcpkgs/filezilla/template                  |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch

diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From 15cf7310fe239fb2e88f325ddb664e9e6c6bfcd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 21:32:12 +0700
Subject: [PATCH 323/904] OpenRCT2: makedepends+=libxml2-devel

Transitive via SDL2-devel -> wayland-devel
---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 8eeb3f75b528..1f4738bdc46a 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"

From ba56859712440c6ac14a10521fc6b1f160ebe68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 22:03:55 +0700
Subject: [PATCH 324/904] OpenRCT2: force some hostmakedepends from staging for
 icu rebuild

---
 srcpkgs/OpenRCT2/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 1f4738bdc46a..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 

From 6d67464626ab6b3cd3bd4563b4bbaae82a1ce52c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:17:03 +0200
Subject: [PATCH 325/904] warzone2100: update to 4.1.3.

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

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index d878605ff26a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.2
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=34964a97452a5b57ed3993ce8365cbf47fcdbd08b7529b1582c02db5b9862240
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 550cfd64f7491f0c9c7222b1b021ae6aa5c54e23 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:21:19 +0200
Subject: [PATCH 326/904] linux5.4: update to 5.4.140.

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

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index c204d64759c3..9316ea45e0a8 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.138
+version=5.4.140
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
+checksum=2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 0c2c3b4e320d06a24a03c46958d329a584b3fba5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:23:51 +0200
Subject: [PATCH 327/904] linux4.19: update to 4.19.203.

---
 srcpkgs/linux4.19/template  |   4 +-
 srcpkgs/linux4.19/templateu | 331 ++++++++++++++++++++++++++++++++++++
 2 files changed, 333 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/linux4.19/templateu

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b79ed782a91c..914f8f45b75f 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.201
+version=4.19.203
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+checksum=ffb04250ae51809d71535650d71f5a3718d774b337d7874ff74a845fbd846afa
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}

From df6ac7f82c6245e956fb5744fee48d7f65d3fde0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:26:58 +0200
Subject: [PATCH 328/904] linux5.13: update to 5.13.10.

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

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 2c8c80b9945f..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.9
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 358da3bbe06ad323c4d0fec4fc8d755a07733ea69363101913fdd6056878113d"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b81792cf006996e4f7ef033d130454d237b5b4dc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:31:43 -0400
Subject: [PATCH 329/904] python3-ciso8601: update to 2.2.0.

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

diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE

From 21bfcd4ac6774c0e4c5072af3561e91fd2913bfc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:32:02 -0400
Subject: [PATCH 330/904] python3-tifffile: update to 2021.8.8.

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

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 0e9e467e1564..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.30
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=86a659791205281b5b75f21b608f28d1c8d669911693796dbe1524494056ec9c
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 

From 629856cdafe6700d14ed35598dceab86f64e5910 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:35:35 -0400
Subject: [PATCH 331/904] xpra: update to 4.2.2.

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

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From ad2beedab0d6dd8de6774b4ca2aa3d7cb628cf18 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:37:27 -0400
Subject: [PATCH 332/904] python3-uvloop: update to 0.16.0.

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

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient

From f7b82245f00e9c6b78abae4038197d20eee5e656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:12 +0200
Subject: [PATCH 333/904] postgresql: update to 9.6.23, adopt.

---
 srcpkgs/postgresql/template | 8 ++++----
 srcpkgs/postgresql/update   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 6c30501a7c61..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"

From 8821e29b55e306b8e38b7b4631b2fcc24b0c5009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:13 +0200
Subject: [PATCH 334/904] postgresql12: update to 12.8.

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

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From 900f075bd5b5aab25a22440ede6fd04626a99058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:14 +0200
Subject: [PATCH 335/904] postgresql13: update to 13.4.

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

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From 4010c7503a9528165f9c64a03aa22649e03a5d6a Mon Sep 17 00:00:00 2001
From: Justin Hibbits <chmeeedalf@gmail.com>
Date: Thu, 12 Aug 2021 13:20:16 -0500
Subject: [PATCH 336/904] claws-mail: update to 3.18.0

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

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"

From 29e617051c2c4d1f60e583feb62030a053da6c6d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 12 Aug 2021 21:50:39 +0200
Subject: [PATCH 337/904] Aegisub: rebuild for icu

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

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)

From 3c4863992d4ec27e4e83db99cd5a635b937af4cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:02:33 +0200
Subject: [PATCH 338/904] unbound: update to 1.13.2.

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

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {

From 065f1b9e785776bd68eafff932fae0434061944e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:04:55 +0200
Subject: [PATCH 339/904] k9s: update to 0.24.15.

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

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From 19536cca5675de7b9407c7556dda6e05158965f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:07:05 +0200
Subject: [PATCH 340/904] skaffold: update to 1.30.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 663f97e1f5f0..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.29.0
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=f12b1f608e8f7095bc5976c40c0c80417ee0a24ae7752012f51074539f311046
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764

From e4cf46aa1a1a23ee7c16345ae2fbd8938a3514ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:11:48 +0200
Subject: [PATCH 341/904] netpbm: update to 10.95.01.

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

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc

From 5c41358d297b3623d2c184e65da13301758835be Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Wed, 11 Aug 2021 02:42:38 +0200
Subject: [PATCH 342/904] libXft: update to 2.3.4

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

diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING

From 726f4f1e6358eb74cac234adc7061e1306a560a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 22:14:29 +0200
Subject: [PATCH 343/904] dovecot: remove INSTALL{,.msg}, we don't ship a
 default config anymore

---
 srcpkgs/dovecot/INSTALL     | 9 ---------
 srcpkgs/dovecot/INSTALL.msg | 6 ------
 srcpkgs/dovecot/template    | 2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg

diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 27a781db5139..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From dd51bb5ebe2578d39e7dc00e0b32aba137baa705 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 5 Aug 2021 22:48:55 -0700
Subject: [PATCH 344/904] CLion: Fix removal of files for unsupported OS/archs

---
 srcpkgs/CLion/template | 43 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index f2ab575cea34..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
 version=2021.2
-revision=1
-archs="i686 x86_64"
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -25,36 +25,37 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
-	rm -rf lib/pty4j-native/linux/arm
-	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/ppc64le
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
 	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
 	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/performanceTesting/bin/yjpagent.dll
 	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
 	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
 	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
+	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
+	rm -rf lib/pty4j-native/linux/ppc64le
+
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/performanceTesting/bin/libyjpagent.so
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
 			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so

From ccc1f503154876860f043c6ae39049bb2e2e31aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 09:46:45 +0700
Subject: [PATCH 345/904] icu: build static with -fPIC

---
 srcpkgs/icu/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index a05d0a7d35a8..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -3,7 +3,7 @@
 #       next soname bump.
 pkgname=icu
 version=69.1
-revision=1
+revision=2
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
@@ -18,6 +18,9 @@ homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
 checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
 
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
+
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
 fi

From 1e8f17d27069053b3071ecda50dfcecc3cde0cbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 13:35:07 +0700
Subject: [PATCH 346/904] enchant2: makedepends+="icu-devel"

Transitive via nuspell-devel anyway.
---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 59413b958747..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e306304564af2126dff70ba06f8369b34ecf3614 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 13 Aug 2021 12:51:06 +0200
Subject: [PATCH 347/904] linux5.10: update to 5.10.58.

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

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6242d17550e8..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.56
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 22c65dd9789e351be751d25120638d9d8db497a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 19:11:28 +0700
Subject: [PATCH 348/904] webkit2gtk: makedepends+= libnuspell-devel
 libpsl-devel

Via libsoup-devel and enchant2-devel
---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 837fd8130803..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -30,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-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>"

From dc441074b665734ef1e0baefff87fe39794e3d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 9 Aug 2021 16:26:57 +0700
Subject: [PATCH 349/904] nss: update to 3.69.

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

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 3c81597a5b7fe67a23b2872c4a423646173c5ad6 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:10:17 +0200
Subject: [PATCH 350/904] thermald: update to 2.4.6.

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

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 8f72d46ecba2a719756c44de25158854f7f0f1d0 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:11:21 +0200
Subject: [PATCH 351/904] terraform: update to 1.0.4.

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

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6

From 32b82b1442d4343c21049151fb8e54147b83bdcb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:13:38 +0200
Subject: [PATCH 352/904] terragrunt: update to 0.31.4.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt

From 2e9d3cd2f5a7643ef358cfcd8c944245a86fef45 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:15:31 +0200
Subject: [PATCH 353/904] hugo: update to 0.87.0.

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

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 03cdeb450eae..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.86.1
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9e4b65249c890945b542d1e2737bdc3cb2240cc9ad081670ae5a65543002f90a
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md

From d616296dbd1b7b3be3afc7fd4ba16be1f3a7f3d7 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:19:37 +0200
Subject: [PATCH 354/904] hopper: update to 4.8.2.

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

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes

From ad96fcaecf177754ab03b18610c181e19a0e57d2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:20:03 +0200
Subject: [PATCH 355/904] hivex: update to 1.3.21.

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

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 1ed578d92e17..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,6 +1,6 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.20
+version=1.3.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f523c37bb064a4bab7db5224902c34eee4f9fab2d9b81cf615b32c0b8509d32d
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes

From 785385875055e451b94158eff543bf0684458ab0 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:36:28 +0200
Subject: [PATCH 356/904] iio-sensor-proxy: update to 3.1.

---
 ...heck-for-.pc-files-before-using-them.patch | 32 -------------------
 srcpkgs/iio-sensor-proxy/template             | 13 +++-----
 2 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch

diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy

From 05c3369544c18b8dac3ad3fd9b8e087343073328 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 Aug 2021 20:46:17 +0200
Subject: [PATCH 357/904] libkdcraw5: update to 21.08.0.

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

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From eca847f33f0e39923685b720b909302b93cc6759 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 Aug 2021 21:14:33 +0200
Subject: [PATCH 358/904] gwenview: update to 21.08.0.

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

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19

From ff00b7eb8ae952c351562fd2d5056227e130ce88 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 12 Aug 2021 22:20:02 +0530
Subject: [PATCH 359/904] Komikku: add patch from upstream

---
 srcpkgs/Komikku/patches/fix-mangadex.patch | 82 ++++++++++++++++++++++
 srcpkgs/Komikku/template                   |  2 +-
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch

diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 7a612602214d..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=0.30.0
-revision=1
+revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"

From 629a676ef1cd737994563d20b758a91febb1ba93 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 3 Aug 2021 08:56:18 +0300
Subject: [PATCH 360/904] xf86-video-amdgpu: update to 21.0.0.

---
 srcpkgs/xf86-video-amdgpu/template | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }

From 3b646056ab98d11ef446eee54b44efcb55d4d7d8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:37:05 +0200
Subject: [PATCH 361/904] meld: update to 3.20.4.

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

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \

From 6c2a3cffe597502b92caaa44e145a5bfa8dd8c93 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:43:07 +0200
Subject: [PATCH 362/904] 0ad-data: update to 0.0.25.

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

diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in

From 7bd2607bee9d2035d97c59dee3e9565c29932364 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:43:24 +0200
Subject: [PATCH 363/904] 0ad: update to 0.0.25.

---
 srcpkgs/0ad/patches/ppc64.patch               | 113 ------------------
 .../patches/spidermonkey-78.6-rust-1.50.patch | 107 -----------------
 srcpkgs/0ad/template                          |   6 +-
 3 files changed, 3 insertions(+), 223 deletions(-)
 delete mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch

diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
deleted file mode 100644
index 95007b32f25e..000000000000
--- a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001
-From: wraitii <wraitii@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 27 Feb 2021 09:31:17 +0000
-Subject: [PATCH] Patch SM78.6 for Rust 1.50
-
-Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-(this fix is integrated in SM78.8)
-
-Reviewed By: s0600204
-
-Differential Revision: https://code.wildfiregames.com/D3590
-
-
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797
----
- libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++
- libraries/source/spidermonkey/patch.sh        |  4 ++
- 2 files changed, 69 insertions(+)
- create mode 100644 libraries/source/spidermonkey/FixRust150.diff
-
-diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff
-new file mode 100644
-index 00000000000..cfb0d58b4a0
---- /dev/null
-+++ b/libraries/source/spidermonkey/FixRust150.diff
-@@ -0,0 +1,65 @@
-+
-+# HG changeset patch
-+# User Emilio Cobos Álvarez <emilio@crisal.io>
-+# Date 1609006565 0
-+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
-+# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
-+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
-+
-+Fixes errors like:
-+
-+  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
-+
-+I've left the most specific dependency, but for wgpu the rev is not
-+right, so I've kept the branch which effectively preserves behavior.
-+
-+Differential Revision: https://phabricator.services.mozilla.com/D100485
-+
-+diff --git a/.cargo/config.in b/.cargo/config.in
-+--- a/.cargo/config.in
-++++ b/.cargo/config.in
-+@@ -1,16 +1,16 @@
-+ # This file contains vendoring instructions for cargo.
-+ # It was generated by `mach vendor rust`.
-+ # Please do not edit.
-+ 
-+ [source."https://github.com/shravanrn/nix/"]
-+-branch = "r0.13.1"
-+ git = "https://github.com/shravanrn/nix/"
-+ replace-with = "vendored-sources"
-++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+ 
-+ [source."https://github.com/mozilla/rkv"]
-+ git = "https://github.com/mozilla/rkv"
-+ replace-with = "vendored-sources"
-+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
-+ 
-+ [source."https://github.com/mozilla/neqo"]
-+ git = "https://github.com/mozilla/neqo"
-+diff --git a/Cargo.lock b/Cargo.lock
-+--- a/Cargo.lock
-++++ b/Cargo.lock
-+@@ -3200,7 +3200,7 @@
-+ [[package]]
-+ name = "nix"
-+ version = "0.13.1"
-+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+ dependencies = [
-+  "bitflags",
-+  "cc",
-+diff --git a/Cargo.toml b/Cargo.toml
-+--- a/Cargo.toml
-++++ b/Cargo.toml
-+@@ -60,8 +60,8 @@
-+ [patch.crates-io]
-+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
-+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
-+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
-+ # failure's backtrace feature might break our builds, see bug 1608157.
-+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-+
-diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
-index 58be1fbdef0..879964b0f2e 100644
---- a/libraries/source/spidermonkey/patch.sh
-+++ b/libraries/source/spidermonkey/patch.sh
-@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
- patch -p1 < ../FixRpiUnalignedFpAccess.diff
- 
-+# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-+# Note that this isn't quite the upstream patch to match our version.
-+patch -p1 < ../FixRust150.diff
-+
- # Patch those separately, as they might interfere with normal behaviour.
- if [ "$(uname -s)" = "FreeBSD" ];
- then
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index f6e6b41899de..2e095d293a6a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
-revision=3
+version=0.0.25
+revision=1
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 

From 636e2eac89cbc2bf7a332507c2da9f46b75d803c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 14 Aug 2021 13:22:34 +0200
Subject: [PATCH 364/904] youtube-viewer: update to 3.9.4.

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

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 92e01bd467a7d8a8698d1a317ae46388e3b7d177 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 14 Aug 2021 14:52:02 +0200
Subject: [PATCH 365/904] knot: update to 3.1.1.

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

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 2188e92dac8b..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.0
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 21b1adf81ba158a4aefb2e33cb5bab44547ae070 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 15:05:28 +0200
Subject: [PATCH 366/904] wine: update to 6.15.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 30be01e169b2..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.14/dlls/dnsapi/libresolv.c
-+++ b/wine-6.14/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2fa789c7e7..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.14
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="64b471939943bc08e351027db6fbc2465c139650a3bffeb91657ff0ee8c25202
- 4792d3d083af6f9b9b9239df7c3b0e344ebe0cf947b689bde97a67bf37d116e4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 5bb06a85187449886038dfed702fd112b7f4ea9f Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 7 Aug 2021 10:17:38 -0600
Subject: [PATCH 367/904] combine mu and mu4e packages and update to 1.6.3

- combine mu and mu4e packages under (more discoverable) name "mu4e"
  - add `replaces`/`provides` for old "mu" package
- add option for optional guile components
- update to 1.6.3
---
 srcpkgs/mu/template   | 36 ------------------------------------
 srcpkgs/mu4e          |  1 -
 srcpkgs/mu4e/template | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 36d67ef65cba..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}

From d2008f9df88ff390316b508e558b0c0517610332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 368/904] filelight: update to 21.08.0.

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

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4

From 636e5ccefdee8cd784e5a2e241db6f86b47dc3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 369/904] kaccounts-integration: update to 21.08.0.

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

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 71ef2cff16a33d8ade05ba3a2abaf94378854866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 370/904] kaccounts-providers: update to 21.08.0.

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

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 0dd9ab3065799a85a53a617575cd0fde183793e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 371/904] kcachegrind: update to 21.08.0.

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

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2

From 87569a37a93a10ebefd2689ec24ec7ba40d79345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 372/904] kcron: update to 21.08.0.

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

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4

From bf024163bb00056717bc4caebc226336b5f4d552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 373/904] kdialog: update to 21.08.0.

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

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de

From 45b4de6dff51a54b6483b20e4415c2b439611f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 374/904] keditbookmarks: update to 21.08.0.

---
 .../patches/20.08.3--fix-tests.patch          | 28 -------------------
 srcpkgs/keditbookmarks/template               |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch

diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc

From c6221ae00301e861e758d57d0489aadbeb24064a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 375/904] kfind: update to 21.08.0.

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

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461

From 9813c9c56c2a62dd5581cefe14a495aaac365153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 376/904] kig: update to 21.08.0.

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

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4

From a34ef8dfe22a6097d4de0ee8dc4fc2e74a78866a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 377/904] kio-gdrive: update to 21.08.0.

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

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa

From 39d1291514042420ecf0867e7decb1d47937b29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 378/904] kmag: update to 21.08.0.

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

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91

From aee39442059ce4bfeb1d8da3814e9356bc701618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 379/904] kmix: update to 21.08.0.

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

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad

From 7dfd1974097c388068fda9ae70501d55a8b38f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 380/904] kolourpaint: update to 21.08.0.

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

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING

From 62487a48f865b051041779a1e71da8d035962b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 381/904] kompare: update to 21.08.0.

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

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4

From 66612ef81311f3186ba92a0d1c913c66094934df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 382/904] kpat: update to 21.08.0.

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

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2

From 46fd830e375e18c145e163868323d9c1c8b7a54b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 383/904] kruler: update to 21.08.0.

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

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af

From f9b161e2e44e28d96dfa0dad68efc6c91d777828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 384/904] ksystemlog: update to 21.08.0.

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

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2

From e3f6a67801e9531f86f8c836e6ebcb0ee3b37927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 385/904] kteatime: update to 21.08.0.

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

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546

From 56c52a8dde0e20f1ce5d2ee17beb625bbd8cf8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 386/904] kturtle: update to 21.08.0.

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

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e

From 3a76aa74841f2b9053cbb468217b09a73a3289f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 387/904] kwalletmanager: update to 21.08.0.

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

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963

From e12b7573074f5a5667c330e2cc1a2ee487fadee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 388/904] libkcddb: update to 21.08.0.

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

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 07514e52bce8326194dde946173de9071fee7917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 389/904] libkdegames: update to 21.08.0.

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

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a39ebb82561d4f6fa6047c4489e40c55367952d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 390/904] libkomparediff2: update to 21.08.0.

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

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ae01143003926f954553e9c6d1fd7a2c8b3b8429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 391/904] marble5: update to 21.08.0.

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

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From 20c726962edae110e32e7a2f89c54afe5accee77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 392/904] signon-kwallet-extension: update to 21.08.0.

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

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72

From d6136171bc80bbb0a2d74c61d274f63f1778686b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 393/904] svgpart: update to 21.08.0.

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

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102

From bc856a55789634aa31e42371c0721de69b1955ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:19 +0200
Subject: [PATCH 394/904] umbrello: update to 21.08.0.

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

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {

From badcca80d5ccc40bf66b24349f814b508456e06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:19 +0200
Subject: [PATCH 395/904] yakuake: update to 21.08.0.

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

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 61d6e2e645c4..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,7 +1,7 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
-revision=2
+version=21.08.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e

From f7e5bfa50dfe3308fc4b71c2f226639bd4e3fcb0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:45:03 +0200
Subject: [PATCH 396/904] linux4.19: update ppc-dotconfig

---
 srcpkgs/linux4.19/files/ppc-dotconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set

From 7472d22fa519e8094bdaa0a3f57f6d423c09f59b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:40:57 +0200
Subject: [PATCH 397/904] linux5.4: update ppc-dotconfig

---
 srcpkgs/linux5.4/files/ppc-dotconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set

From b9954559d6513a0f079a5910e564bfe1389232ce Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:43:14 +0200
Subject: [PATCH 398/904] linux5.13: update ppc-dotconfig

---
 srcpkgs/linux5.13/files/ppc-dotconfig | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set

From 6bd5db5a525f2d8ecdc34330e630d0f46c3900b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 14 Aug 2021 22:49:10 +0700
Subject: [PATCH 399/904] apostrophe: depends on webkit2gtk

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

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 85f2d9de065b3883f20cbf8491fdf8eb2685db1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 14 Aug 2021 21:51:15 +0700
Subject: [PATCH 400/904] python3-pypandoc: update to 1.6.3.

---
 srcpkgs/python3-pypandoc/patches/no-pip.patch | 20 +++++++++++++++++++
 srcpkgs/python3-pypandoc/template             |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch

diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE

From 00cebfe5ede1c5b4100524112e39d733bde20515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:19 +0700
Subject: [PATCH 401/904] python3-usb: update to 1.2.1.

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

diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE

From 6390544e141d8e219ec6429f618f94958e409a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:23 +0700
Subject: [PATCH 402/904] python3-elementpath: update to 2.2.3.

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

diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling

From feab321bbbdda1d2f9bfa5bc7d91ecb0e2ca90fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:38 +0700
Subject: [PATCH 403/904] python3-pyscard: update to 2.0.1.

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

diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 

From 6ec59d2863e47144018e3bc4cb0764321688006f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:13:50 +0700
Subject: [PATCH 404/904] sip: update to 6.1.1.

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

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From dd2bbb612668730e70521eafad5e109955fa7b67 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 Aug 2021 18:54:54 +0200
Subject: [PATCH 405/904] python3-boto3: update to 1.18.21.

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

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE

From f14d227a93b862664e491c1d1119ebaac6dfae16 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 18:36:44 +0200
Subject: [PATCH 406/904] onionshare: remove package

* doesn't work with Flask 2
---
 srcpkgs/onionshare/template       | 23 -----------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 srcpkgs/onionshare/template

diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c9349197c278..3b1dbd467489 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -219,6 +219,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4

From 9790c876ea1b143bf734197634ef9ee8ade48f9a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 14:30:33 +0200
Subject: [PATCH 407/904] python3-urwidtrees: update to 1.0.3.

---
 srcpkgs/python3-urwidtrees/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a

From 3c4b3353a650f6510200094ae118b9b4ebc20b2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 14:30:36 +0200
Subject: [PATCH 408/904] stig: update to 0.12.2a0, adopt

---
 srcpkgs/stig/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged

From 401cc6e1d2f916912189131221976c6b4d6d3fa6 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Wed, 11 Aug 2021 15:13:07 +0100
Subject: [PATCH 409/904] gopls: update to 0.7.1.

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

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE

From 1293985fd849608395e66387b323fc26694ba1c2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 14 Aug 2021 20:39:23 +0200
Subject: [PATCH 410/904] ccextractor: update to 0.92

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

diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {

From 7fbb3dfe1a1746c4ff4b66124ca6186b97c0d441 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 Aug 2021 11:29:10 -0400
Subject: [PATCH 411/904] python3-matplotlib: update to 3.4.3.

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

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From 9ce2f6c2ce1501e3bd3f820d35479d79d9bede4c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 14 Aug 2021 15:42:28 -0500
Subject: [PATCH 412/904] New package: vault-acme-0.0.8.

---
 srcpkgs/vault-acme/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/vault-acme/template

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}

From b03e78ca21c96ae33cd8ddf03004b4a3aa46c131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 10 Aug 2021 19:56:34 -0300
Subject: [PATCH 413/904] pari: update to 2.13.2.

- enable pthreads build
- switch gp binary to static link libpari; this offsets the slowdown due
  to pthreads
- use -flto and -fno-semantic-interposition which improve speed a little
  bit more
- ship the static library, so external programs can static link
- change of maintainer agreed by sgn

I had to add a minimal patch to the makefile, so that the build step
builds and the install step installs. I will try to upstream that patch.
---
 common/shlibs                       |  1 +
 srcpkgs/pari/patches/makefile.patch | 36 +++++++++++++++++++++++++++++
 srcpkgs/pari/template               | 22 +++++++++++-------
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/pari/patches/makefile.patch

diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..301649ded872 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3981,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From 8d1830ddf2074926ad0f21bb7696437d8911acfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 18:06:12 -0300
Subject: [PATCH 414/904] giac: revbump for pari

---
 srcpkgs/giac/patches/pari_2_13.patch | 16 ++++++++++++++++
 srcpkgs/giac/template                |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch

diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel

From aeb903fc162da4f01a8533234d00a0946bcfb24d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 18:13:17 -0300
Subject: [PATCH 415/904] qcas: revbump for giac

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

diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"

From e633911ebeea9920b1114046326feb04e6cb969d Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 14 Aug 2021 23:34:04 +0200
Subject: [PATCH 416/904] sequeler: update to 0.8.2.

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

diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876

From 020937c264a05d7f55e044e5b3243f40aa1bc2c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:49 +0200
Subject: [PATCH 417/904] dolphin: update to 21.08.0.

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

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From 2ffb4d9d366325b08bb7be970352f78f0993463d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:55 +0200
Subject: [PATCH 418/904] akonadi-calendar: update to 21.08.0.

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

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6e5d8912ad4cbb42350a0fea91e440e5cdd42da2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:57 +0200
Subject: [PATCH 419/904] akonadi-contacts: update to 21.08.0.

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

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From 6e38f8aabf3ad491ce2b100eda08640d13e22178 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:58 +0200
Subject: [PATCH 420/904] akonadi-import-wizard: update to 21.08.0.

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

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c81356092b05ff009840655d7b72d734655488bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:00 +0200
Subject: [PATCH 421/904] akonadi-mime: update to 21.08.0.

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

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 35175b25db570237ef26c71a03476511bf3800fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:01 +0200
Subject: [PATCH 422/904] akonadi-notes: update to 21.08.0.

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

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 04db0ce513a8f64d5a32f8ee46d0c9eb5a36e4dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:02 +0200
Subject: [PATCH 423/904] akonadi-search: update to 21.08.0.

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

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d93fb037b983fff526b1b7863d570e4c6c4f1a09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:04 +0200
Subject: [PATCH 424/904] calendarsupport: update to 21.08.0.

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

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From dbfbec6c30c6f04ba403ee49dd31de8b6126165d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:05 +0200
Subject: [PATCH 425/904] grantleetheme: update to 21.08.0.

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

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From e598fe37ba96b243c9e6c1997ebd4eda399c72b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:07 +0200
Subject: [PATCH 426/904] kalarmcal: update to 21.08.0.

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

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 7eb5053bfc06eda3fbd665e24c9b496e737ae65c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:08 +0200
Subject: [PATCH 427/904] kcalutils: update to 21.08.0.

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

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a7ab2399130c5fb7ce6ec51bef216313f66fd078 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:10 +0200
Subject: [PATCH 428/904] kdepim-runtime: update to 21.08.0.

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

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From e7fab3edbb346ee62542d969ef17442525102433 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:11 +0200
Subject: [PATCH 429/904] kimap: update to 21.08.0.

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

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From 16b7a75dfce0cda75e9e23b6b8012fc2d76d877c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:13 +0200
Subject: [PATCH 430/904] kldap: update to 21.08.0.

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

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 175888530d32da30cd97f22da371071e39cc31d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:13 +0200
Subject: [PATCH 431/904] kmail: update to 21.08.0.

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

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca

From 86076e73fdef8cd899393567e0d20b2e88ff1870 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:15 +0200
Subject: [PATCH 432/904] kmail-account-wizard: update to 21.08.0.

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

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93

From ae4dd4f0429946974890af3cfcac03c9efae8585 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:16 +0200
Subject: [PATCH 433/904] kmailtransport: update to 21.08.0.

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

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 1b4238f248e298903585d294960473bf0012b4ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:17 +0200
Subject: [PATCH 434/904] kmbox: update to 21.08.0.

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

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 76b0ab85f8dc4b9ad5eebdf401839466fef17b47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:19 +0200
Subject: [PATCH 435/904] kmime: update to 21.08.0.

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

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 20c94482635055098fa7438f5e64116290c28f4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:19 +0200
Subject: [PATCH 436/904] kde5-baseapps: update to 21.08.0.

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

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="

From 3a613f37679523598c36eb9fb73333bb6989b2c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:20 +0200
Subject: [PATCH 437/904] kontactinterface: update to 21.08.0.

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

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 18338ab3b8616697dc1276f6763f8037a3fecfea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:21 +0200
Subject: [PATCH 438/904] ksmtp: update to 21.08.0.

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

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0fe569c84d568eb09b06c3f6b232a2ff925acd75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:23 +0200
Subject: [PATCH 439/904] ktnef: update to 21.08.0.

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

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f0f1a9a3d194ddcf6d9205eb9b02eb39c2925e45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:24 +0200
Subject: [PATCH 440/904] kate5: update to 21.08.0.

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

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 8fe5bd4baeb9db0f0e16b61efd864df79af7965f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:24 +0200
Subject: [PATCH 441/904] libgravatar: update to 21.08.0.

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

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7cc1b20371d68533e8136c49cdac3277dc9facd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:25 +0200
Subject: [PATCH 442/904] konsole: update to 21.08.0.

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

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From 375968e1fbd5af62282ed7bd81bdee593c2e52bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:26 +0200
Subject: [PATCH 443/904] libkdepim: update to 21.08.0.

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

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From cd203e368f013458715fa4fa354381026fdaecb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:27 +0200
Subject: [PATCH 444/904] baloo-widgets5: update to 21.08.0.

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

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From 038f2eb501f61fea8ab675eae6f255c0a926b0a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:27 +0200
Subject: [PATCH 445/904] libkgapi: update to 21.08.0.

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

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:

From 81680633c7a0a27cece55d1266e707d917cad75d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:28 +0200
Subject: [PATCH 446/904] kio-extras: update to 21.08.0.

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

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d

From 867e5b08a93ac29057df8f5a3fcfe61ac64094d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:29 +0200
Subject: [PATCH 447/904] libkleo: update to 21.08.0.

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

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 34f0d13d51e31529868c29f6e22e99ef2142491c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:31 +0200
Subject: [PATCH 448/904] okular: update to 21.08.0.

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

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build

From 931bff9dc535ebcabe9c5782d39d35ec52bbcd1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:32 +0200
Subject: [PATCH 449/904] kleopatra: update to 21.08.0.

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

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test

From f4140020b92cb8e9f823b6dc56709aab78d07f82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:32 +0200
Subject: [PATCH 450/904] libkexiv25: update to 21.08.0.

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

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 6c74e078251019684626595547a11aa2584d8081 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:33 +0200
Subject: [PATCH 451/904] libksieve: update to 21.08.0.

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

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 5e05ac066fe43c979f9ca4d960dfae7092355e0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:35 +0200
Subject: [PATCH 452/904] mailcommon: update to 21.08.0.

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

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 25a3c2cfe6f3c81fea2d4e8b34837d50497ea881 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:36 +0200
Subject: [PATCH 453/904] spectacle: update to 21.08.0.

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

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3

From 3ab798aae29367641e5256f195d742241e0f75e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:38 +0200
Subject: [PATCH 454/904] libkipi5: update to 21.08.0.

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

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 315082e3fd6450762144e97f808fc64ac5f4798f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:39 +0200
Subject: [PATCH 455/904] messagelib: update to 21.08.0.

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

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 

From 67b54345ef22814fc8701bcb9b6c6f005e5a1fd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:40 +0200
Subject: [PATCH 456/904] pimcommon: update to 21.08.0.

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

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c4578717e5a34931c3495cbf6cf915eab9860499 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:42 +0200
Subject: [PATCH 457/904] kpimtextedit: update to 21.08.0.

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

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From c9f470446b3a9aae608a882dba2a4a95db9fad63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:43 +0200
Subject: [PATCH 458/904] kidentitymanagement: update to 21.08.0.

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

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 0c8d6f448b9af314fea93183bcabf9d776b03f30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:45 +0200
Subject: [PATCH 459/904] akonadi5: update to 21.08.0.

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

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 28a2182b0ae8a426ea0d5cdc4b4183b8aabe6fd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:46 +0200
Subject: [PATCH 460/904] pim-data-exporter: update to 21.08.0.

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

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d

From aa1d685598f5e051ebf53c891d93777e1f25eb99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:05:06 +0200
Subject: [PATCH 461/904] dolphin-plugins: update to 21.08.0.

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

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4

From d251f3565029969f5c3e1c1d18b4615e3ab34e7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:05:12 +0200
Subject: [PATCH 462/904] mailimporter: update to 21.08.0.

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

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 09e9a49c46195add606ea8ba217ddf8937754927 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:52:44 +0200
Subject: [PATCH 463/904] khelpcenter: update to 21.08.0.

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

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 7e039edd66c21fb61bd0328fb59eb414801ebe0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:52:56 +0200
Subject: [PATCH 464/904] ark: update to 21.08.0.

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

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build

From 996ce18cc4ff6e0d182fb8b5cc713fdcc2118ed9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:52:58 +0200
Subject: [PATCH 465/904] elisa: update to 21.08.0.

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

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From f3e7d12b46d700aade8471f5d70e6f502654065d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:00 +0200
Subject: [PATCH 466/904] kdeconnect: update to 21.08.0.

---
 srcpkgs/kdeconnect/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3

From acd57f1e47ba483d6ef106cdfab8d27e9638773f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:01 +0200
Subject: [PATCH 467/904] kdegraphics-thumbnailers: update to 21.08.0.

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

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab

From d0c6f487e2f9c7129ba6dd7204b9ddcd7dbfc2a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:03 +0200
Subject: [PATCH 468/904] knights: update to 21.08.0.

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

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3

From b7df72494c1e2cc716ced70430cf74a42f8406df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:04 +0200
Subject: [PATCH 469/904] kqtquickcharts: update to 21.08.0.

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

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 66c5f0be4ae0859cecc2dbac0c2a0fe8681b3eab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 23:03:41 +0200
Subject: [PATCH 470/904] gespeaker: remove package

doesn't work with espeak-ng
---
 srcpkgs/gespeaker/template | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/gespeaker/template

diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15

From ba5c112faa41fa2200565410b55331bd6aa4e9ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 23:03:54 +0200
Subject: [PATCH 471/904] removed-packages: add gespeaker

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3b1dbd467489..292ffc7ea954 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -69,6 +69,7 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1

From c087e6282f2a715002507f126e453ee1d536b5d1 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sat, 14 Aug 2021 01:26:36 +0300
Subject: [PATCH 472/904] bmake: update to 20210808.

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

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ef3463e7e554..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210803
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=a7127d581661038219e21531486f4779b333eb5395e5c8fc2426b20badd24c87
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {

From de390478bcf9f22d756015785aa79a70aed995e8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 14 Aug 2021 11:46:36 +0200
Subject: [PATCH 473/904] ardour: update to 6.9.

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

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"

From 676b68d969243d42d69b72a77c27e35418ee3fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 15 Aug 2021 10:27:14 +0200
Subject: [PATCH 474/904] doomretro: update to 4.2.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251

From 5782d8db622e243a75e47f92ca410bde75e4ef47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 15 Aug 2021 10:36:47 +0200
Subject: [PATCH 475/904] exiftool: update to 12.30.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f

From 70c6f121d3901f952df6085473c585cfee966b39 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sun, 15 Aug 2021 17:51:22 +0700
Subject: [PATCH 476/904] kamoso: update to 21.08.0

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

diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602

From c1fa096214e243541a0c6dfb1454b3a37d08dae7 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 15 Aug 2021 19:23:52 +0300
Subject: [PATCH 477/904] evilwm: update to 1.3.1.

---
 srcpkgs/evilwm/files/evilwm.desktop | 11 -----------
 srcpkgs/evilwm/template             | 17 +++++++++--------
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop

diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }

From f0f9d0f28c750d4366b6d1797e20405d1e5c729e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 15 Aug 2021 18:20:00 +0200
Subject: [PATCH 478/904] zathura-pdf-mupdf: update to 0.3.7

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

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..256a5d51f883 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
-revision=2
+version=0.3.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
 LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"

From 59621360e9ac1b8da7a112f63727355925a8f542 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 15 Aug 2021 18:21:42 +0200
Subject: [PATCH 479/904] zathura-ps: update to 0.2.7

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

diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE

From 3b85f82c1e5c3ba94567d64ef79e0c06a18ed683 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 13 Aug 2021 08:50:01 +0200
Subject: [PATCH 480/904] xmobar: update to 0.39

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

diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"

From 4a78102bfb6faa8e96cc4340b0b8b4377fee4a65 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 12 Aug 2021 16:58:56 +0300
Subject: [PATCH 481/904] libjpeg-turbo: update to 2.1.1.

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

diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"

From 004e6e74647dbfb7fd10606bf6c963bef10fea53 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 482/904] x265: update to 3.5.

---
 common/shlibs         |  2 +-
 srcpkgs/x265/template | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 301649ded872..42fd333f33b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi

From d1580fe8af808339e3d816ef114620dd40667279 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:44 +0300
Subject: [PATCH 483/904] ffmpeg: revbump for x265

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

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0a0d24683082..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 1573efe55e6f42b28e9856308b98eea02eda5151 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:55 +0300
Subject: [PATCH 484/904] vlc: revbump for x265

also add ci-skip due to fail on test/run_vlc.sh
---
 srcpkgs/vlc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"

From eb0df25457cd2006b024b94a5a845b9387492c3d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:00 +0300
Subject: [PATCH 485/904] libheif: revbump for x265

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

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"

From 8116626b5297aa9dfc503e07498fc41375d53574 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:08 +0300
Subject: [PATCH 486/904] handbrake: revbump for x265

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

diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden

From 62362f7aed07a5036bfacd7ed9bdeebd87ae61a0 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:15 +0300
Subject: [PATCH 487/904] gst-plugins-bad1: revbump for x265

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From e02fc3e6ee02fa80ca9d165ab3d52e4bf5bdd9ef Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:22 +0300
Subject: [PATCH 488/904] avidemux: revbump for x265

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

diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"

From 57fd773b1a81dff40c12cb0c1a0ca8f8f1350fbc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 15 Aug 2021 17:20:59 -0400
Subject: [PATCH 489/904] spotify-qt: update to 3.7.

---
 .../spotify-qt/patches/disable-crash-handler.patch | 14 ++++++++++++++
 srcpkgs/spotify-qt/template                        |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch

diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8

From bbd0d8556897e0b02980ff777d601b73caac959e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 15 Aug 2021 23:56:48 +0200
Subject: [PATCH 490/904] lagrange: update to 1.6.3.

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

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 15992e57dbaa..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.2
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=b67b0c0e95c221f5afcd0f4d81c1130401adbbdfc802761bbf012e478b720767
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md

From b48d5804ebccedddc17b5e9aa9a4219515fb45d6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:43 +0400
Subject: [PATCH 491/904] fmt: update to 8.0.1.

---
 common/shlibs        | 2 +-
 srcpkgs/fmt/template | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 42fd333f33b9..d24c2bacbc9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE

From 478623d6f05c374f7b030e3395d56279c4631ee6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 492/904] spdlog: update to 1.9.1.

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

diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"

From e5e13f246b4434958ca0f939456c29d834215307 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 493/904] cherrytree: rebuild against libfmt.so.8

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

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 8789cd37dba7..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
 version=0.99.39
-revision=1
+revision=2
 wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"

From 5892d7cac871cfbac705bb3769ba70da5667df38 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 494/904] Waybar: rebuild for libfmt.so.8.

---
 .../patches/libfmt8-compatibility.patch       | 40 +++++++++++++++++++
 srcpkgs/Waybar/template                       |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch

diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}

From af595c35782ed31786d07e54181a6ec765e3feb1 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 495/904] gerbera: rebuild against libfmt.so.8

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

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

From e0208a8a60281bb3d906ac270ca8808b55be10ca Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 496/904] kodi: fold kodi-rpi into it, rebuild for libfmt.so.8

We don't want to maintain kodi 18.x into eternity (which would start
with patching it correctly for libfmt.so.8), and, as explained in
9f8647640b3ce3e4a99f0ba7022eb6d55ba77c97, current kodi can't be built
for rpi specifically anymore. We will assume normal kodi is enough.
---
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 ---
 .../patches/add-missing-includes.patch        |  10 --
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 ------
 .../disable-static-texturepacker-build.patch  |  11 --
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 -----------
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 --
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 --
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 ---
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 ------
 srcpkgs/kodi-rpi/template                     | 119 ------------------
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 ++
 srcpkgs/kodi/template                         |   8 +-
 17 files changed, 15 insertions(+), 364 deletions(-)
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch

diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}

From 36f50e1b5fdb8a9cb78c9fce400fd7045784c8e3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 497/904] mkvtoolnix: rebuild against libfmt.so.8

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

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0875991a872f..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
 version=60.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt

From e51d5ff8c2efdda954b958f1f45a4e528a8ee33f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 498/904] nheko: rebuild against libfmt.so.8

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

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel

From dc59a2d0ae7e4019c0989928fdce81877e0d3d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 8 Aug 2021 18:38:31 -0300
Subject: [PATCH 499/904] cryfs: rebuild against libfmt.so.8

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

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d8f855a80af..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=3
+revision=4
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off

From 7be2f6f9604a82eafb9eea2b3eeafc86cdb41028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 Aug 2021 18:31:05 -0300
Subject: [PATCH 500/904] 0ad: rebuild against libfmt.so.8

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

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 2e095d293a6a..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.25
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From 98d4e9983ebd97388cc4d3df2ba35f78cf3cfe42 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 15 Aug 2021 20:22:27 -0400
Subject: [PATCH 501/904] zathura-pdf-mupdf: depends on gumbo now

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

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 256a5d51f883..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,11 +1,12 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
 version=0.3.7
-revision=1
+revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -15,8 +16,6 @@ distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.t
 checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }

From 67f6597157e7a2edc9b9f437adaa007402415c98 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:13:43 +0200
Subject: [PATCH 502/904] gucci: update to 1.5.0.

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

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..58cdb9f09567 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=a59c2ce87e17ef46d9c89b126f959633a053110b7a16a84f65e7750f3e0ac396
 
 post_install() {
 	vlicense LICENSE

From 141dd76ccda89461c888a667f53307987a9657dd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:14:43 +0200
Subject: [PATCH 503/904] python3-pyinfra: update to 1.4.12.

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

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index b7c5bebb3e56..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.11
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=809c54e78e89517a9736ab1f82f896c881f8d050a4aec366fc4962198b224bda
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 142cba517ed64cad042f5fdb177ca1b53d06810e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:17:01 +0200
Subject: [PATCH 504/904] openbsd-netcat: update to 1.217.1.

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

diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc

From 1d037747a4d6be8b0a25a8611646d2d656542f00 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 13:10:03 +0200
Subject: [PATCH 505/904] gucci: fix checksum.

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

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 58cdb9f09567..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=a59c2ce87e17ef46d9c89b126f959633a053110b7a16a84f65e7750f3e0ac396
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE

From 184a1c3f4149087636233327c965fb63baef7486 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:52:54 +0300
Subject: [PATCH 506/904] New package: libdecor-0.1.0_1

---
 common/shlibs             |  1 +
 srcpkgs/libdecor-devel    |  1 +
 srcpkgs/libdecor/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template

diff --git a/common/shlibs b/common/shlibs
index d24c2bacbc9e..befa6484dfee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4005,3 +4005,4 @@ liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 4475adf2055c8e031eee16ce62bd0207f78757c0 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:53:28 +0300
Subject: [PATCH 507/904] SDL2: update to 2.0.16.

---
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch | 32 +++++++++++++++++++
 srcpkgs/SDL2/template                         | 24 +++++++++-----
 2 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch

diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi

From bbcc6c046db9b1a977509d1ece5e01490ed01150 Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@posteo.net>
Date: Fri, 13 Aug 2021 13:48:11 +0200
Subject: [PATCH 508/904] pandoc: update to 2.14.0.3

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes

From 634c4c416e9ff7f237beeb7829da6fe2cb35c5fa Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 16 Aug 2021 17:47:30 +0100
Subject: [PATCH 509/904] font-iosevka: update to 10.0.0.

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

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 1388c2af3ccd..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=9.0.1
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
-df3a4b213241d76868a559be72a7a1828892503bb2fa21453584439dae77d620
-be88b5bc4ff6484817df71b1f6bc87adf56d9c050dfa1b75c9014d1e791b7b5d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 479ae248d35ed495b0f8bd3bfaa5d8fe4ba13abb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:38 +0200
Subject: [PATCH 510/904] attica: update to 5.85.0.

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

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build

From 6d18853363054abd15723d2fdcc0456d518d9729 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:39 +0200
Subject: [PATCH 511/904] baloo5: update to 5.85.0.

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

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build

From f5586192d446b753d87388e2a91f8f62567616cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:40 +0200
Subject: [PATCH 512/904] bluez-qt5: update to 5.85.0.

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

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build

From b561b723939d8372e12d1102db1a7d23e656c287 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:42 +0200
Subject: [PATCH 513/904] breeze-icons: update to 5.85.0.

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

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From ab314a62f804883c2c4924206b02fe1235c4c2cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:43 +0200
Subject: [PATCH 514/904] extra-cmake-modules: update to 5.85.0.

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

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {

From 407d68ab48b5237999f572c4e87c29d991d23b93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:45 +0200
Subject: [PATCH 515/904] frameworkintegration: update to 5.85.0.

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

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From f1a8d5a9606dcb4581d9e41e27edf6cdd1c11bf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:46 +0200
Subject: [PATCH 516/904] kactivities5-stats: update to 5.85.0.

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

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 226887f6b0d8013943d1a7fb98d37d43c60f49fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:48 +0200
Subject: [PATCH 517/904] kactivities5: update to 5.85.0.

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

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 421bdbfd685ae407e626d4d9feb5ba28537e7a9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:49 +0200
Subject: [PATCH 518/904] kapidox: update to 5.85.0.

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

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 0a6a72d0ed42f3f316186a4f9e8715017104b4ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:51 +0200
Subject: [PATCH 519/904] karchive: update to 5.85.0.

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

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"

From ba0924087e7436bb229767987798a6e2d33af434 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:52 +0200
Subject: [PATCH 520/904] kauth: update to 5.85.0.

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

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build

From 796dcfb7345218128051d5d348d7e6b3bb858458 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:53 +0200
Subject: [PATCH 521/904] kbookmarks: update to 5.85.0.

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

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 413e82c5dda5d699e9b6aaa1b7dbdd0c2097bcd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:55 +0200
Subject: [PATCH 522/904] kcalendarcore: update to 5.85.0.

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

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {

From 7d460d76de38b0c08143e72379077070af21b520 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:56 +0200
Subject: [PATCH 523/904] kcmutils: update to 5.85.0.

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

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From c06aac3a2fc0cccc0a7df1c757bb8412a4a61715 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:58 +0200
Subject: [PATCH 524/904] kcodecs: update to 5.85.0.

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

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 0faf3e2f7ec506d4112cb98ac227a1b2f43e709e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:59 +0200
Subject: [PATCH 525/904] kcompletion: update to 5.85.0.

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

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From 8314444bef10e4548e3aeec25ac975cfb8857b97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:00 +0200
Subject: [PATCH 526/904] kconfig: update to 5.85.0.

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

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build

From bb1518b43c0d6e4b3e59dd4ac5bfc13d99f80ba5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:02 +0200
Subject: [PATCH 527/904] kconfigwidgets: update to 5.85.0.

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

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From ccd328d79f53625c7ecdad60e54f2dc94251ce4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:03 +0200
Subject: [PATCH 528/904] kcontacts: update to 5.85.0.

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

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 9dfeaf47c9140d1f850a75f226bab10327d9cfc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:05 +0200
Subject: [PATCH 529/904] kcoreaddons: update to 5.85.0.

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

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 952af6bf1651637034c2604bb9ef961296d4f405 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:06 +0200
Subject: [PATCH 530/904] kcrash: update to 5.85.0.

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

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 124e41548e75bbbb969ac9244ff7be2f0ef7d2f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:07 +0200
Subject: [PATCH 531/904] kdav: update to 5.85.0.

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

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 9766f76215ebd4a9bee134b80d09a496c9787e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:09 +0200
Subject: [PATCH 532/904] kdbusaddons: update to 5.85.0.

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

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build

From 3a2d83e1c0175f50a71226cf86504ea6cc2c2d23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:10 +0200
Subject: [PATCH 533/904] kdeclarative: update to 5.85.0.

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

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build

From a1d72a25bbb708d0bb094d5d3c4f2a5a4d264f71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:11 +0200
Subject: [PATCH 534/904] kded: update to 5.85.0.

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

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 5760378202516ae1d7f94a50e8002cfd79f975b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:13 +0200
Subject: [PATCH 535/904] kdelibs4support: update to 5.85.0.

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

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From dadffdbc3d7557bfaf0edc8e58bdfb4b87984847 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:15 +0200
Subject: [PATCH 536/904] kdesignerplugin: update to 5.85.0.

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

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 417da38c36fa18ba0642a0a7e6eda1749c6cfdfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:16 +0200
Subject: [PATCH 537/904] kdesu: update to 5.85.0.

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

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From e32e25067365e4b5155f79ed5d2d6aed6da45e38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:17 +0200
Subject: [PATCH 538/904] kdewebkit: update to 5.85.0.

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

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From a6e416347e23ecb481b1e28e16a2ced38145c109 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:19 +0200
Subject: [PATCH 539/904] kdnssd: update to 5.85.0.

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

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 492e8cf7d32686b860a5c88b5b234b7e2dc59844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:20 +0200
Subject: [PATCH 540/904] kdoctools: update to 5.85.0.

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

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From e136fa653880236f364dda4d1113e803e71c899e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:22 +0200
Subject: [PATCH 541/904] kemoticons: update to 5.85.0.

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

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From c28016e4c48fcf453c4acaf6d5b4507405834c3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:23 +0200
Subject: [PATCH 542/904] kfilemetadata5: update to 5.85.0.

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

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From c908547fca751d4827e4452a09343553ddc4b0a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:25 +0200
Subject: [PATCH 543/904] kglobalaccel: update to 5.85.0.

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

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From b818119073da2b1bc7301ee8c2ac65f764da4acf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:26 +0200
Subject: [PATCH 544/904] kguiaddons: update to 5.85.0.

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

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 87b500936af9907332fe3a7259a245d48995af2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:27 +0200
Subject: [PATCH 545/904] kholidays: update to 5.85.0.

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

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From a1483f6188b48132bc58248e887259e72e62d88a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:29 +0200
Subject: [PATCH 546/904] khtml: update to 5.85.0.

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

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 9e1ce841a3a1cc804a2401db8e799b8bc52f059a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:31 +0200
Subject: [PATCH 547/904] ki18n: update to 5.85.0.

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

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From ba1fe1170713cc849675ee48f284de7638d3443c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:32 +0200
Subject: [PATCH 548/904] kiconthemes: update to 5.85.0.

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

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From e163e21a75f35a1c270bf8bc36947ef4a4af2b3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:33 +0200
Subject: [PATCH 549/904] kidletime: update to 5.85.0.

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

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 882dd38eb1123a56af6c518b2082f9a2cfe8517e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:35 +0200
Subject: [PATCH 550/904] kimageformats: update to 5.85.0.

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

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799

From 0bbc93f630887a1cc3cab087c9be73c58d247269 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:36 +0200
Subject: [PATCH 551/904] kinit: update to 5.85.0.

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

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"

From 884ed1e49ccdb673cb7fa3edff7d24fea797743c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:38 +0200
Subject: [PATCH 552/904] kio: update to 5.85.0.

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

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build

From c1063e99e4c16eafb361da9f751b58155d05fdc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:39 +0200
Subject: [PATCH 553/904] kirigami2: update to 5.85.0.

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

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 5f71bebb6a697868d576932a885bf77e8043fea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:41 +0200
Subject: [PATCH 554/904] kitemmodels: update to 5.85.0.

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

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 4e55b832736e11ac6b12cfec110eeb6ddb4d74f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:42 +0200
Subject: [PATCH 555/904] kitemviews: update to 5.85.0.

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

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From aeb6b918fd8b6f0b5bed2a1ed6edcd92482dd068 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:43 +0200
Subject: [PATCH 556/904] kjobwidgets: update to 5.85.0.

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

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 00b2fff5d09035bf8d542044e94cbc2bbb7141a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:45 +0200
Subject: [PATCH 557/904] kjs: update to 5.85.0.

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

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 10957e2060cec267cf9a77f127f8ac0d6ae3b663 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:46 +0200
Subject: [PATCH 558/904] kjsembed: update to 5.85.0.

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

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 8fc01663ff2deae28a0ed9cfb195e129063f5407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:47 +0200
Subject: [PATCH 559/904] kmediaplayer: update to 5.85.0.

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

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 6aabe74f31ae7b4f2cd531b500a62d489b6c3824 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:49 +0200
Subject: [PATCH 560/904] knewstuff: update to 5.85.0.

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

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 156fa1a0102b..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,7 +1,7 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
-revision=2
+version=5.85.0
+revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 08f4f482aabedd54d92d7cb11a9c7aed18ba1bbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:50 +0200
Subject: [PATCH 561/904] knotifications: update to 5.85.0.

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

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From c260d8606dd60259314d1ddcf2f220c1f6915f3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:52 +0200
Subject: [PATCH 562/904] knotifyconfig: update to 5.85.0.

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

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From d22bdf969fc6371053dfd16ed7afd33e4a99a482 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:53 +0200
Subject: [PATCH 563/904] kpackage: update to 5.85.0.

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

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 5107f6221bac8cf51151401423e4b15a0044080a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:54 +0200
Subject: [PATCH 564/904] kparts: update to 5.85.0.

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

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!

From c82992fd1562c36ec043b0b9719afc463502b4ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:56 +0200
Subject: [PATCH 565/904] kpeople: update to 5.85.0.

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

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build

From 4dbaca30d6347fccaf11ca98afac68392471f2fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:57 +0200
Subject: [PATCH 566/904] kplotting: update to 5.85.0.

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

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 18b9207f0968642cdd519a7d4ebb7bc679b9ee2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:58 +0200
Subject: [PATCH 567/904] kpty: update to 5.85.0.

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

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"

From d3de270d818af2ec65e2dd93694f7963b9a66b58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:00 +0200
Subject: [PATCH 568/904] kquickcharts: update to 5.85.0.

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

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build

From f05a4049a95bcb2105052ec55eb0997f8071d490 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:01 +0200
Subject: [PATCH 569/904] kross: update to 5.85.0.

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

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f44aff40827b91758185973c86650c4909b5d860 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:02 +0200
Subject: [PATCH 570/904] krunner: update to 5.85.0.

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

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build

From c33144cf7abe1c765658279c14f699bbec220944 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:03 +0200
Subject: [PATCH 571/904] kservice: update to 5.85.0.

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

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 82eb9a32e8d04637425f989775e944d28539410d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:05 +0200
Subject: [PATCH 572/904] ksolid: update to 5.85.0.

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

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 5fc8f19e4b0d2a31e5a9d8338dc7afe0c00cec57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:07 +0200
Subject: [PATCH 573/904] ktexteditor: update to 5.85.0.

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

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build

From df25b6aa814699ece44ee61179130c1b8dea51a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:08 +0200
Subject: [PATCH 574/904] ktextwidgets: update to 5.85.0.

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

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 782373185156ce4a604494094624e74c9b020fac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:10 +0200
Subject: [PATCH 575/904] kunitconversion: update to 5.85.0.

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

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From e24e2b7da45b0e54b3155ca416940a19962e495b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:11 +0200
Subject: [PATCH 576/904] kwallet: update to 5.85.0.

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

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 390f4731f60ea792ff14e85e22b36aee1b5f5ceb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:13 +0200
Subject: [PATCH 577/904] kwayland: update to 5.85.0.

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

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From f1fdba11504b849fad73170f62c88828d7cecc19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:14 +0200
Subject: [PATCH 578/904] kwidgetsaddons: update to 5.85.0.

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

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build

From 2466842b79b18e80734985a55a8dca2ad05fcca3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:16 +0200
Subject: [PATCH 579/904] kwindowsystem: update to 5.85.0.

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

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 74a3ee6c81093a1d9ebb195e3b6895dcac574d56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:17 +0200
Subject: [PATCH 580/904] kxmlgui: update to 5.85.0.

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

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build

From cece6b41d70cbcc1c668bea5d5af305c855c3415 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:18 +0200
Subject: [PATCH 581/904] kxmlrpcclient: update to 5.85.0.

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

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From b1e9305eda346cdffac9db294b12d4bd6feebd46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:20 +0200
Subject: [PATCH 582/904] modemmanager-qt5: update to 5.85.0.

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

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build

From 9addce7ffbbbd46b2cd704928400eff08e996f47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:22 +0200
Subject: [PATCH 583/904] networkmanager-qt5: update to 5.85.0.

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

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build

From efb0542e840d1dda493432d83a6943178b44cf21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:56 +0200
Subject: [PATCH 584/904] oxygen-icons5: update to 5.85.0.

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

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 36148112cabf48eddafd371ba2a32988a8dc75cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:58 +0200
Subject: [PATCH 585/904] plasma-framework: update to 5.85.0.

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

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build

From 1279322b8b68af15cec09baa3a7e8fed064655b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:59 +0200
Subject: [PATCH 586/904] prison: update to 5.85.0.

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

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From e9a1e08b5c7663cc830ddd3c553188771f0f6e5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:01 +0200
Subject: [PATCH 587/904] purpose: update to 5.85.0.

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

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build

From 5bc14a7aa55281e3afc4523436563a3e4e7f5fa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:02 +0200
Subject: [PATCH 588/904] qqc2-desktop-style: update to 5.85.0.

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

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 67b06c99f08106a0b385db001c12aa982f7526b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:03 +0200
Subject: [PATCH 589/904] sonnet: update to 5.85.0.

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

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From 6a7a2abb39c97280e30c99006d819c00b9632110 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:05 +0200
Subject: [PATCH 590/904] syndication: update to 5.85.0.

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

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 3fb78647904cb64dbd35b9d8419e176e43bf686f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:07 +0200
Subject: [PATCH 591/904] syntax-highlighting: update to 5.85.0.

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

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 306b27cef6e60821a3f4e4d795fd93038e9a68d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:08 +0200
Subject: [PATCH 592/904] threadweaver: update to 5.85.0.

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

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From c07cf72917a2800c19bae9654fad79efc10fbdba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 00:38:43 +0200
Subject: [PATCH 593/904] libspa-ffmpeg: remove package

this plugin is useless right now, so removing it to break a cycle
SDL2 -> pipewire -> ffmpeg -> SDL2
---
 srcpkgs/libspa-ffmpeg     |  1 -
 srcpkgs/pipewire/template | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/libspa-ffmpeg

diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {

From affa31040595f882b18c97a11c1c177d0682b37a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 00:39:04 +0200
Subject: [PATCH 594/904] removed-packages: add libspa-ffmpeg and revbump

---
 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 292ffc7ea954..2bba802eef79 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=48
+revision=49
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -324,6 +324,7 @@ replaces="
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
  nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 0dbaa51eaab52dd0e9b6bfacd96e61fc74a1b1fe Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 15 Aug 2021 18:47:02 +0300
Subject: [PATCH 595/904] wob: update to 0.12.

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

diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE

From 296faed229f4ce732dd6bb203c0f50a5cae54214 Mon Sep 17 00:00:00 2001
From: Vo Kar <vokar97@pm.me>
Date: Tue, 17 Aug 2021 13:27:35 +0300
Subject: [PATCH 596/904] i3status-rust: update to 0.20.3.

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

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From d5889da73978a2335beb28cc2a5a49af8769a928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:10 +0700
Subject: [PATCH 597/904] perl-CGI: depends on perl-HTML-Parser

Even Debian has this mandatory dependencies
---
 srcpkgs/perl-CGI/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From cc202844a1837f8b1cbb7f72a9300e45f1abb464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:11 +0700
Subject: [PATCH 598/904] git: update to 2.33.0.

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

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 0c1621bd4936cb6869bc0c51aab329de60bfc368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:13 +0700
Subject: [PATCH 599/904] chroot-git: update to 2.33.0.

---
 srcpkgs/chroot-git/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..2bdb4d76bee0 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,20 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
+	checkdepends="perl gnupg"
 else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
@@ -28,7 +27,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +37,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -52,6 +53,10 @@ do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }

From 61ff458cd07d6b3cd44c6f43182ba8d506a62097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 21:28:05 +0700
Subject: [PATCH 600/904] chroot-git: use masterdir's zlib-devel in bootstrap

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

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 2bdb4d76bee0..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -14,8 +14,6 @@ checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -47,6 +45,9 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {

From cbe6c2787f8386fd6ae93535adf7b17eb93b187d Mon Sep 17 00:00:00 2001
From: auronandace <81362994+auronandace@users.noreply.github.com>
Date: Mon, 16 Aug 2021 18:54:22 +0100
Subject: [PATCH 601/904] alacritty: update to 0.9.0

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

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 0f02fb7b82f0e6dc9a7db68561e0cbd77788b1c5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Aug 2021 15:46:15 +0200
Subject: [PATCH 602/904] perl-IO-Socket-SSL: update to 2.072.

---
 srcpkgs/perl-IO-Socket-SSL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d

From e12bd89a5319ff200d73439de5c17e07380c3fe4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Aug 2021 19:15:01 +0200
Subject: [PATCH 603/904] libx86: fix illegal instruction in LRMI_init.

E.g. triggered by read-edid.
Change upstream to debian source.
Adopt.
---
 srcpkgs/libx86/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}

From 20abb48cf6e5ca2d36a70d3d451c621c81f8e674 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 19:40:27 +0200
Subject: [PATCH 604/904] linux5.4: update to 5.4.141.

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

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 9316ea45e0a8..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.140
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 950f7a36c94b9e7c215ef10bbe5ba848b83b6318 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 22:37:02 +0700
Subject: [PATCH 605/904] ktuberling: update to 21.08.0

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

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297

From f9627a2d3981f36f7d0c854bbdc76d18b785894f Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 22:32:46 +0700
Subject: [PATCH 606/904] krfb: update to 21.08.0

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

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592

From e1a96b4bfc0f46b49f79e7c7b998a7ef3a41c351 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 19:42:19 +0200
Subject: [PATCH 607/904] linux4.19: update to 4.19.204.

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

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 914f8f45b75f..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.203
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=ffb04250ae51809d71535650d71f5a3718d774b337d7874ff74a845fbd846afa
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From e3972cbebc93d044fdb958d560f3fab29daa9010 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 20:00:21 +0200
Subject: [PATCH 608/904] smplayer: update to 21.8.0.

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

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {

From 3b5c8f9c4b88fdd0b8a2da44b6e234d3d8b7b7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 17:56:19 +0200
Subject: [PATCH 609/904] xbps-src: source msg_warn before its first use

---
 xbps-src | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..5e75926c5ad5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -689,12 +689,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +696,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From b4b7ca391ceb40f9fb5c929fd13fd35037793c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 18:58:39 +0200
Subject: [PATCH 610/904] xbps-src: limit warning on file:/// mirror to related
 targets

---
 xbps-src | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xbps-src b/xbps-src
index 5e75926c5ad5..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }

From b23eed63d682cb521054bf7843eeeb75e429f8f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:30 +0200
Subject: [PATCH 611/904] diffoscope: update to 180.

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

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e

From 1225989e52d2ab5102713c94a042f426f00e6c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:31 +0200
Subject: [PATCH 612/904] hunspell-pl_PL: update to 20210731.

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

diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip

From 7d5f7c5bbc0b5a40e18813d6d324d5e2f4e95237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:32 +0200
Subject: [PATCH 613/904] python3-libarchive-c: update to 3.1.

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

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103

From dc92c61ca5ab2e0a2ca0a4395a728a0d21a224dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:33 +0200
Subject: [PATCH 614/904] python3-pysol_cards: update to 0.10.2.

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

diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE

From 2e1c9a6b1598b057eb7c793c98ba5945f0423df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:34 +0200
Subject: [PATCH 615/904] tox: update to 3.24.1.

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

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From 3f5925c65e3cee119a27fb603b65cbe2b80011a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:50:44 +0200
Subject: [PATCH 616/904] konversation: update to 21.08.0.

---
 srcpkgs/konversation/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi

From a2150b10ff24308c41bfe0e44fc0c52cb3490372 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 02:00:52 +0700
Subject: [PATCH 617/904] gnome-desktop: update to 40.3

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"

From efb6175677a5dd6921fb54ecf75d55a2b8e9abda Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 02:34:23 +0700
Subject: [PATCH 618/904] gnome-shell: update to 40.3

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ 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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }

From 3b9bc6cda6c3032ea1cc5437363c466b68b039b4 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 03:39:28 +0700
Subject: [PATCH 619/904] gnome-shell-extensions: update to 40.3

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

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 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=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b

From 10c42af199f502d85aced2ca2cf63bba31a06679 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 22:18:12 +0200
Subject: [PATCH 620/904] gnome-shell-mousewheel-zoom: remove package

* inactive
* doesn't work with current GNOME
---
 srcpkgs/gnome-shell-mousewheel-zoom/template | 23 --------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template

diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}

From 57a8eb82f365ec00400735dce91ec7d87f1d1b26 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 22:19:25 +0200
Subject: [PATCH 621/904] removed-packages: add gnome-shell-mousewheel-zoom

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2bba802eef79..3565931e6fa4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -74,6 +74,7 @@ replaces="
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6

From 598333be8478113391a6ffde531907d25fe1016e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:51:05 +0200
Subject: [PATCH 622/904] img2pdf: disable tests

tests need ImageMagick6
---
 srcpkgs/img2pdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6

From 5b6bc69ed931bc0dbd6968cdba05155d848334ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:52:41 +0200
Subject: [PATCH 623/904] ImageMagick6: remove package

---
 srcpkgs/ImageMagick6/template | 86 -----------------------------------
 srcpkgs/ImageMagick6/update   |  1 -
 srcpkgs/libmagick6            |  1 -
 srcpkgs/libmagick6-devel      |  1 -
 srcpkgs/libmagick6-perl       |  1 -
 5 files changed, 90 deletions(-)
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 213d98a37659..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file

From d3d1dc3d1c084148c7de302ae94b340b7f599164 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:53:22 +0200
Subject: [PATCH 624/904] removed-packages: add ImageMagick6 and revbump

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3565931e6fa4..6c774757a5da 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=49
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -182,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11

From 7e5e7a4af28238b1506b97d664ce2542910dfd03 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 17 Aug 2021 19:05:44 -0400
Subject: [PATCH 625/904] ejabberd: update to 21.07.

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

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"

From 3eddea8420b5f826744ebede44c21d7f17a05aa2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:04:01 -0400
Subject: [PATCH 626/904] mongo-c-driver: update to 1.19.0.

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

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 3f0fef250ac12787c80f58acc460d33c517c717f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:10:49 -0400
Subject: [PATCH 627/904] pcsclite: update to 1.9.3.

---
 srcpkgs/pcsclite/patches/python3.patch | 12 +++---------
 srcpkgs/pcsclite/template              |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd

From a6c266582370184e266c4e8b8cd97cf7916ae735 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:17:43 -0400
Subject: [PATCH 628/904] oidentd: update to 3.0.0.

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

diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd

From 89ab4fc473e0ca528f5e30b846c7537b0cbc6772 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:19:02 -0400
Subject: [PATCH 629/904] sqlmap: update to 1.5.8.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {

From 4351fbfcf420a87d23358987e99be116805b9817 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:30:25 -0400
Subject: [PATCH 630/904] libnsl: update to 2.0.0.

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

diff --git a/common/shlibs b/common/shlibs
index befa6484dfee..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3658,7 +3658,7 @@ libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
 libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi

From 3c71febdd4ab4a86af74fcd95dd2aca20405b3a0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:25:57 -0400
Subject: [PATCH 631/904] log4cpp: bump for libnsl

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

diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"

From cf7eb04691da631742d8d4e28c9525808436ace0 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 17 Aug 2021 10:18:54 -0500
Subject: [PATCH 632/904] kitty: update to 0.23.1.

Closes: #32541 [via git-merge-pr]
---
 srcpkgs/kitty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 

From 89b27ae63c0bffc9418286e89e5c54e228aa3cc0 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Aug 2021 13:48:09 +0200
Subject: [PATCH 633/904] fuzzel: update to 1.6.2.

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

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From be165767e88d096873d19954ba5a0c46f7633d0e Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Aug 2021 13:50:37 +0200
Subject: [PATCH 634/904] fcft: update to 2.4.5.

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

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"

From 3fb390a793e2d8a351fa979b520ceaae1966de1f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 16 Aug 2021 21:49:01 +0200
Subject: [PATCH 635/904] dbeaver: update to 21.1.5.

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b5ae64ae7d74..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.4
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {

From 6330118e8208d081316eb3336fad51bb63af1d73 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 13 Aug 2021 13:38:02 -0500
Subject: [PATCH 636/904] mesa: update to 21.1.7.

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

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 68d6a112681e..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.6
-revision=2
-wrksrc="mesa-${version}"
+version=21.1.7
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From d5f6e468f7536007ea2f65e8c6c2af7f9f2c16f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 17 Aug 2021 16:56:25 -0300
Subject: [PATCH 637/904] haproxy: update to 2.4.3.

Move to using DEBUG_CFLAGS when passing CFLAGS to makefile, otherwise we
override their required CFLAGS, such as -fwrapv.
---
 srcpkgs/haproxy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index c155186f100d..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
-revision=2
+version=2.4.3
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"

From 653cebeebab3a8d16d10204d35ff09055b3757ea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:54:42 -0400
Subject: [PATCH 638/904] grpc: update to 1.39.1.

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

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then

From 0e7045e851cdda4f8ba55a416cb77390321b40eb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:55:19 -0400
Subject: [PATCH 639/904] python3-Pygments: update to 2.10.0.

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

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From 82132fba277d28c9715a1777c6ef268199440e64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:56:50 -0400
Subject: [PATCH 640/904] python3-numpy: update to 1.21.2.

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

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"

From 164170acbab9a1fd3c03038f7ac1514240a07d71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 21:11:07 -0400
Subject: [PATCH 641/904] python3-pandas: update to 1.3.2.

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

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From 3be1aa6ff675f01d155c8d22f07b69e1c5122b23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:07:59 -0400
Subject: [PATCH 642/904] python3-pip: update to 21.2.4.

---
 .../python3-pip/patches/no-versioned-pip.patch | 18 +++++++++---------
 srcpkgs/python3-pip/template                   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index b07a3022fe14..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,12 +1,12 @@
 --- a/setup.py
 +++ b/setup.py
 @@ -67,9 +67,7 @@
-     },
-     entry_points={
-         "console_scripts": [
--            "pip=pip._internal.cli.main:main",
-             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
-         ],
-     },
-     zip_safe=False,
+     },
+     entry_points={
+         "console_scripts": [
+-            "pip=pip._internal.cli.main:main",
+             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
+         ],
+     },
+     zip_safe=False,
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 225ede1ccd09..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.3
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=91e66f2a2702e7d2dcc092ed8c5ebe923e69b9997ea28ba25823943bcd3bf820
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 

From 8125b7fe1aa32376c4d89ac50bd06ff0444bba86 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:09:24 -0400
Subject: [PATCH 643/904] python3-pytools: update to 2021.2.8.

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

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE

From 965f4d45ba41538168032316ddb4d5493b2cc922 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:09:43 -0400
Subject: [PATCH 644/904] python3-ultrajson: update to 4.1.0.

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

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt

From cc521db325b1540ea95b0cf4195760292d61ac65 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:12:25 -0400
Subject: [PATCH 645/904] qtutilities: update to 6.5.0.

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

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From ebeae779498c3ebec182a9afc5e159e192a00d27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:12:39 -0400
Subject: [PATCH 646/904] tagparser: update to 10.1.0.

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

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From b7eecfed3fceed92a80ef7fd33393a6a11d8161b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:13:20 -0400
Subject: [PATCH 647/904] tageditor: update to 3.4.3.

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

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index fbbbbe79bd3b..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.2
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From b9f2634255299b9d6832d05f6553cb0ffb672aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 18 Aug 2021 17:52:18 +0700
Subject: [PATCH 648/904] deluge: fix config location

https://github.com/void-linux/void-packages/issues/31690#issuecomment-901012340

Programming is hard, let's go shopping.
---
 srcpkgs/deluge/files/deluged/run | 2 +-
 srcpkgs/deluge/template          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..6162f08d46b0 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config/deluge ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..7deb5f64686c 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=13
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"

From 42f1d8e7da4aefadfe8ca65969b14595919f8fa2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 14 Aug 2021 19:57:05 +0200
Subject: [PATCH 649/904] perl-Alien: rebuild for perl-5.34

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

diff --git a/srcpkgs/perl-Alien/template b/srcpkgs/perl-Alien/template
index 781ef525c8b5..92fafcf9e247 100644
--- a/srcpkgs/perl-Alien/template
+++ b/srcpkgs/perl-Alien/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Alien'
 pkgname=perl-Alien
 version=0.96
-revision=2
+revision=3
 wrksrc="Alien-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From fe07cf5a76b1c6a81779212ad1cdcfd8277527fe Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 14 Aug 2021 19:57:06 +0200
Subject: [PATCH 650/904] perl-List-SomeUtils: rebuild for perl-5.34

---
 srcpkgs/perl-List-SomeUtils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-List-SomeUtils/template b/srcpkgs/perl-List-SomeUtils/template
index b1860f746f47..4c613d8c13fb 100644
--- a/srcpkgs/perl-List-SomeUtils/template
+++ b/srcpkgs/perl-List-SomeUtils/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-List-SomeUtils'
 pkgname=perl-List-SomeUtils
 version=0.58
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From d678bb734ccb520cd724f04462a2a0bae56a7994 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 14 Aug 2021 19:57:06 +0200
Subject: [PATCH 651/904] perl-List-UtilsBy: rebuild for perl-5.34

---
 srcpkgs/perl-List-UtilsBy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-List-UtilsBy/template b/srcpkgs/perl-List-UtilsBy/template
index b3a07623e1c4..81c817f13e0b 100644
--- a/srcpkgs/perl-List-UtilsBy/template
+++ b/srcpkgs/perl-List-UtilsBy/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-List-UtilsBy'
 pkgname=perl-List-UtilsBy
 version=0.11
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl-Module-Build"

From ea4a66c41fdc5a1878cc409f39b247a93d1a87d6 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 14 Aug 2021 19:57:06 +0200
Subject: [PATCH 652/904] perl-List-MoreUtils: rebuild for perl-5.34 and fix
 lint

---
 srcpkgs/perl-List-MoreUtils/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/perl-List-MoreUtils/template b/srcpkgs/perl-List-MoreUtils/template
index 8271a6ed5503..bbcf2b68ce7c 100644
--- a/srcpkgs/perl-List-MoreUtils/template
+++ b/srcpkgs/perl-List-MoreUtils/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-List-MoreUtils'
 pkgname=perl-List-MoreUtils
 version=0.430
-revision=2
+revision=3
 wrksrc="List-MoreUtils-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,12 +9,9 @@ makedepends="perl perl-Exporter-Tiny"
 depends="$makedepends"
 short_desc="List::MoreUtils - Provide the stuff missing in List::Util"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="https://metacpan.org/release/List-MoreUtils-XS"
 license="Apache-2.0, Artistic-1.0, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/List-MoreUtils-XS"
 distfiles="${CPAN_SITE}/List/List-MoreUtils-${version}.tar.gz"
 checksum=63b1f7842cd42d9b538d1e34e0330de5ff1559e4c2737342506418276f646527
-
-do_check() {
-	# Lots of tests requires perl-List-MoreUtils-XS which depends on this package
-	:
-}
+# Lots of tests require perl-List-MoreUtils-XS, which depends on this package
+make_check=no

From 676d3efaf80b15ac06153b6378421c2aefd6f266 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:44:11 +0300
Subject: [PATCH 653/904] pcre: update to 8.45.

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

diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template
index e2f0b635b30d..4e23babf8f87 100644
--- a/srcpkgs/pcre/template
+++ b/srcpkgs/pcre/template
@@ -1,6 +1,6 @@
 # Template file for 'pcre'
 pkgname=pcre
-version=8.44
+version=8.45
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8 --enable-unicode-properties --with-pic
@@ -10,9 +10,9 @@ makedepends="bzip2-devel libedit-devel zlib-devel"
 short_desc="Perl Compatible Regular Expressions"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.pcre.org/"
+homepage="https://www.pcre.org/"
 distfiles="https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2"
-checksum=19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d
+checksum=4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8
 
 case "$XBPS_TARGET_MACHINE" in
 	mips*) ;; # Without stack for recursion the mips builds fail

From 7982040e56f9546dcd7decc720fcc5a13cc29640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 Aug 2021 15:53:42 -0300
Subject: [PATCH 654/904] grep: update to 3.7.

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

diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index c825c4974352..7bab5c9c28e6 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,6 +1,6 @@
 # Template file for 'grep'
 pkgname=grep
-version=3.6
+version=3.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 
 pre_check() {
 	case "$XBPS_TARGET_MACHINE" in

From 1370ec2bca55659fcefbe1b0818189bc2d037d9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Aug 2021 13:48:05 +0200
Subject: [PATCH 655/904] linux5.13: update to 5.13.12.

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

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..fca1c9dadf86 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.12
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ 5e70a8b3c5fc6bc7eb0bc55b455d373b031b4ed6c73a961fa84378b6baabfde9"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 4aa8e84a9d856c8874dad4edf7c0017c8f6e5479 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 18:18:45 +0200
Subject: [PATCH 656/904] gpsd: update to 3.23.

---
 common/shlibs                               |  4 ++--
 srcpkgs/gpsd/patches/SConstruct-cross.patch | 13 -------------
 srcpkgs/gpsd/patches/hotplug.patch          | 11 +++++++++++
 srcpkgs/gpsd/template                       |  6 +++---
 4 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/gpsd/patches/SConstruct-cross.patch
 create mode 100644 srcpkgs/gpsd/patches/hotplug.patch

diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..548401e239b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -74,7 +74,7 @@ libpanelw.so.6 ncurses-libs-5.8_1 ignore
 libmenuw.so.6 ncurses-libs-5.8_1 ignore
 libobjc.so.4 libobjc-4.7.3_12
 libgomp.so.1 libgomp-4.4.0_1
-libgps.so.25 gpsd-3.20_1
+libgps.so.29 gpsd-3.23_1
 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
@@ -424,7 +424,7 @@ libdca.so.0 libdca-0.0.5_1
 libmpeg2.so.0 libmpeg2-0.5.1_1
 libmpeg2convert.so.0 libmpeg2-0.5.1_1
 libmng.so.2 libmng-2.0.2_1
-libQgpsmm.so.25 gpsd-qt-3.20_1
+libQgpsmm.so.29 gpsd-qt-3.23_1
 libsysfs.so.2 libsysfs-2.1.0_1
 libsensors.so.5 libsensors-3.5.0_1
 libcap-ng.so.0 libcap-ng-0.6.2_1
diff --git a/srcpkgs/gpsd/patches/SConstruct-cross.patch b/srcpkgs/gpsd/patches/SConstruct-cross.patch
deleted file mode 100644
index 9d64d2a3fa5e..000000000000
--- a/srcpkgs/gpsd/patches/SConstruct-cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/SConstruct~	2020-01-01 02:31:27.000000000 +0100
-+++ b/SConstruct	2020-05-17 11:20:07.334411693 +0200
-@@ -629,6 +629,10 @@
- 
-     # run it
-     ret = context.TryRun(program, '.c')
-+    if not ret[1]:
-+        # Assume 8
-+        context.Result("unchecked")
-+        return '8'
-     context.Result(ret[0])
-     return ret[1]
- 
diff --git a/srcpkgs/gpsd/patches/hotplug.patch b/srcpkgs/gpsd/patches/hotplug.patch
new file mode 100644
index 000000000000..0d78f34b7618
--- /dev/null
+++ b/srcpkgs/gpsd/patches/hotplug.patch
@@ -0,0 +1,11 @@
+--- a/SConscript
++++ b/SConscript
+@@ -3060,7 +3060,7 @@
+     hotplug_wrapper_install = []
+ else:
+     hotplug_wrapper_install = [
+-        'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
++        'cp $SRCDIR/../gpsd.hotplug ' + DESTDIR + env['udevdir'],
+         'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug'
+     ]
+ 
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 4198bf214936..1238d196df4a 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -1,7 +1,7 @@
 # Template file for 'gpsd'
 pkgname=gpsd
-version=3.20
-revision=2
+version=3.23
+revision=1
 build_style=scons
 make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin
  udevdir=/usr/lib/udev CC=${CC} qt_versioned=5"
@@ -15,7 +15,7 @@ maintainer="uriahheep <uriahheep@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://www.catb.org/gpsd/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.xz"
-checksum=3998a5cbb728e97f896f46c3c83301b1e6c5d859393e58c2fad8c5426774d571
+checksum=e36429b9f6fc42004894dff3dc4453f5b43f95af8533b96d3d135987418da9df
 python_version=3	# Must be same version as scons
 system_accounts="gpsd"
 

From 934f8164c7e1c57281580aa09e80c7afc4859f45 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 18:11:28 +0200
Subject: [PATCH 657/904] marble5: rebuild for gpsd-2.32_1.

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

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..d0953d681e1d 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,7 +1,7 @@
 # Template file for 'marble5'
 pkgname=marble5
 version=21.08.0
-revision=1
+revision=2
 wrksrc="marble-${version}"
 build_style=cmake
 configure_args="-DBUILD_MARBLE_TESTS=NO -DKF5_HOST_TOOLING=/usr/lib/cmake"

From e73c7de64155069247e62560cabd022b8869ec14 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 18:11:28 +0200
Subject: [PATCH 658/904] navit: update to 0.5.6.

---
 srcpkgs/navit/patches/QPainterPath.patch | 10 ----------
 srcpkgs/navit/template                   |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/navit/patches/QPainterPath.patch

diff --git a/srcpkgs/navit/patches/QPainterPath.patch b/srcpkgs/navit/patches/QPainterPath.patch
deleted file mode 100644
index 5e3b5be7022d..000000000000
--- a/srcpkgs/navit/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/navit/graphics/qt5/graphics_qt5.cpp	2020-01-19 00:36:55.000000000 +0100
-+++ b/navit/graphics/qt5/graphics_qt5.cpp	2020-09-02 14:53:01.762542347 +0200
-@@ -45,6 +45,7 @@
- #include <QFont>
- #include <QGuiApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QScreen>
- #include <QSvgRenderer>
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 449ef1ca16d3..96e17b3b3689 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
 # Template file for 'navit'
 pkgname=navit
-version=0.5.4
-revision=3
+version=0.5.6
+revision=1
 build_style=cmake
 configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.0-only"
 homepage="http://www.navit-project.org/"
 distfiles="https://github.com/navit-gps/navit/archive/v${version}.tar.gz"
-checksum=728d9dcad00e97769f6cd85bfad5518b0edf62ef75d60543fa4c48c1c3ab1243
+checksum=043688e0b34504ca4ee80fb6a80895b938eae41e4031d0977dd30c20c20f1714
 
 pre_configure() {
 	sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt

From a963b7744c543aaac94a63d2acafa6118a36a607 Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Wed, 26 May 2021 11:04:45 -0400
Subject: [PATCH 659/904] New package: catatonit-0.1.5

---
 .../use-environ-instead-of-__environ.patch    | 29 +++++++++++++++++++
 srcpkgs/catatonit/template                    | 26 +++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
 create mode 100644 srcpkgs/catatonit/template

diff --git a/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch b/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
new file mode 100644
index 000000000000..c32276f9cbc6
--- /dev/null
+++ b/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
@@ -0,0 +1,29 @@
+From 75014b1c3099245b7d0f44f24d7f6dc4888a45fd Mon Sep 17 00:00:00 2001
+From: Andrey Golovizin <ag@sologoc.com>
+Date: Mon, 1 Mar 2021 18:41:42 +0100
+Subject: [PATCH] Use environ instead of __environ
+
+The `__environ` variable is internal and undocumented. It also breaks
+compilation with musl.
+
+Signed-off-by: Andrey Golovizin <ag@sologoc.com>
+---
+ catatonit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/catatonit.c b/catatonit.c
+index a05451e..fd746bb 100644
+--- a/catatonit.c
++++ b/catatonit.c
+@@ -216,7 +216,7 @@ static int spawn_pid1(char *file, char **argv, sigset_t *sigmask)
+ 	if (sigprocmask(SIG_SETMASK, sigmask, NULL) < 0)
+ 		bail("failed to reset sigmask: %m");
+ 
+-	execvpe(file, argv, __environ);
++	execvpe(file, argv, environ);
+ 	bail("failed to exec pid1: %m");
+ }
+ 
+-- 
+2.31.1
+
diff --git a/srcpkgs/catatonit/template b/srcpkgs/catatonit/template
new file mode 100644
index 000000000000..29cc233b7d51
--- /dev/null
+++ b/srcpkgs/catatonit/template
@@ -0,0 +1,26 @@
+# Template file for 'catatonit'
+pkgname=catatonit
+version=0.1.5
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Container init that is so simple it's effectively brain-dead"
+maintainer="Justin Bronder <jsbronder@cold-front.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/openSUSE/catatonit"
+distfiles="https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.tar.xz"
+checksum=4c45e2230235751731da3daabe130abce70b3ef37d0b1936cbc90a46b475cf08
+
+pre_configure() {
+	autoreconf -fi
+}
+
+do_install() {
+	vmkdir usr/libexec/catatonit
+	vinstall catatonit 0755 usr/libexec/catatonit
+
+	# Following suit with Fedora/Ubuntu, podman-run will default to looking
+	# for catatonit here when passed the "--init" argument
+	vmkdir usr/libexec/podman
+	ln -sf ../catatonit/catatonit "${DESTDIR}/usr/libexec/podman"
+}

From a1df66138a5ee702a719590247141f88760994a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 19:39:04 -0300
Subject: [PATCH 660/904] giac: update to 1.7.0.25.

---
 srcpkgs/giac/patches/malloc.patch    |  6 +++---
 srcpkgs/giac/patches/pari_2_13.patch | 16 ----------------
 srcpkgs/giac/template                |  7 ++++---
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch

diff --git a/srcpkgs/giac/patches/malloc.patch b/srcpkgs/giac/patches/malloc.patch
index fed46d63d736..52d70e0ad21b 100644
--- a/srcpkgs/giac/patches/malloc.patch
+++ b/srcpkgs/giac/patches/malloc.patch
@@ -1,11 +1,11 @@
 --- a/src/History.cc	2017-10-02 10:23:46.000000000 +0200
 +++ b/src/History.cc	2017-11-14 15:42:12.119849965 +0100
-@@ -3828,7 +3828,7 @@
+@@ -4633,7 +4633,7 @@
        // mode_s += "Time: ";
        // double t=double(clock());
        // mode_s += xcas::print_DOUBLE_(t/CLOCKS_PER_SEC);
--#ifdef HAVE_MALLOC_H //
-+#if defined HAVE_MALLOC_H && defined __GLIBC__ //
+-#if defined(HAVE_MALLOC_H) && !defined(__MINGW_H)
++#if defined(HAVE_MALLOC_H) && !defined(__MINGW_H) && defined(__GLIBC__)
        struct mallinfo mem=mallinfo();
        double memd=mem.arena+mem.hblkhd;
        mode_s +=xcas::print_DOUBLE_(memd/1048576);
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..3fc5eb17c661 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,9 +1,10 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.5.0.87
-revision=5
+version=1.7.0.25
+revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
+configure_args="--disable-micropy --disable-quickjs"
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
  libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
 depends="desktop-file-utils hicolor-icon-theme"
@@ -12,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
+checksum=948dfc369f22ca068ff29be7222eb8e7aea3f004b0541f87b8a5591735d42134
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

From 96629602df38ed5bbffca84621e93194da312fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 Jan 2018 11:18:35 -0300
Subject: [PATCH 661/904] New package: gf2x-1.3.0

---
 common/options.description |  1 +
 common/shlibs              |  1 +
 srcpkgs/gf2x-devel         |  1 +
 srcpkgs/gf2x/template      | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/gf2x/update        |  1 +
 5 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/gf2x-devel
 create mode 100644 srcpkgs/gf2x/template
 create mode 100644 srcpkgs/gf2x/update

diff --git a/common/options.description b/common/options.description
index 06360211a23f..46e24a140e52 100644
--- a/common/options.description
+++ b/common/options.description
@@ -49,6 +49,7 @@ desc_option_lz4="Enable support for LZ4 compression format"
 desc_option_lzo="Enable support for LZO compression format"
 desc_option_microhttpd="Enable support for microhttpd"
 desc_option_mpcdec="Enable support for the Musepack decoder"
+desc_option_native_build="Enable instruction subsets supported by the build computer"
 desc_option_notify="Enable support for desktop notifications (libnotify)"
 desc_option_nvenc="Enable support for NVENC codecs"
 desc_option_openblas="Enable support for OpenBLAS accelerated linear algebra"
diff --git a/common/shlibs b/common/shlibs
index 548401e239b9..76a40ce5fe4d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3984,6 +3984,7 @@ libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
+libgf2x.so.3 gf2x-1.3.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/gf2x-devel b/srcpkgs/gf2x-devel
new file mode 120000
index 000000000000..4542295e8de7
--- /dev/null
+++ b/srcpkgs/gf2x-devel
@@ -0,0 +1 @@
+gf2x
\ No newline at end of file
diff --git a/srcpkgs/gf2x/template b/srcpkgs/gf2x/template
new file mode 100644
index 000000000000..b056ac4f87f7
--- /dev/null
+++ b/srcpkgs/gf2x/template
@@ -0,0 +1,35 @@
+# Template file for 'gf2x'
+pkgname=gf2x
+version=1.3.0
+revision=1
+wrksrc=gf2x-gf2x-${version}
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="C/C++ library for fast arithmetic in GF(2)[x]"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.inria.fr/gf2x/gf2x"
+distfiles="https://gitlab.inria.fr/gf2x/gf2x/-/archive/gf2x-${version}/gf2x-gf2x-${version}.tar.gz"
+checksum=11bcf98b620c60c2ee3b4460b02b7be741f14cfdc26b542f22c92950926575e0
+
+build_options="native_build"
+
+if [ -z "$build_option_native_build" ]; then
+	# this disables sse3, ssse3, sse41, pclmul
+	configure_args="--disable-sse3"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+gf2x-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}
diff --git a/srcpkgs/gf2x/update b/srcpkgs/gf2x/update
new file mode 100644
index 000000000000..504503610161
--- /dev/null
+++ b/srcpkgs/gf2x/update
@@ -0,0 +1 @@
+pkgname=gf2x-gf2x

From 13a6f1fa1669c8ed987979ee81f84e21d391c413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 30 Jan 2018 11:02:38 -0300
Subject: [PATCH 662/904] New package: ntl-11.5.1

---
 common/shlibs        |  1 +
 srcpkgs/ntl-devel    |  1 +
 srcpkgs/ntl/template | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/ntl/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/ntl-devel
 create mode 100644 srcpkgs/ntl/template
 create mode 100644 srcpkgs/ntl/update

diff --git a/common/shlibs b/common/shlibs
index 76a40ce5fe4d..773f18ca4156 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3985,6 +3985,7 @@ libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
+libntl.so.44 ntl-11.5.1_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/ntl-devel b/srcpkgs/ntl-devel
new file mode 120000
index 000000000000..fc0a39987329
--- /dev/null
+++ b/srcpkgs/ntl-devel
@@ -0,0 +1 @@
+ntl
\ No newline at end of file
diff --git a/srcpkgs/ntl/template b/srcpkgs/ntl/template
new file mode 100644
index 000000000000..e4b84a45cd3d
--- /dev/null
+++ b/srcpkgs/ntl/template
@@ -0,0 +1,35 @@
+# Template file for 'ntl'
+pkgname=ntl
+version=11.5.1
+revision=1
+build_wrksrc="src"
+build_style=configure
+hostmakedepends="perl libtool"
+makedepends="gmp-devel gf2x-devel"
+short_desc="Library for doing Number Theory"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="LGPL-2.1-or-later"
+homepage="https://libntl.org"
+distfiles="https://libntl.org/ntl-${version}.tar.gz"
+checksum=210d06c31306cbc6eaf6814453c56c776d9d8e8df36d74eb306f6a523d1c6a8a
+nocross=yes # runs binaries built for target
+
+build_options="native_build"
+
+do_configure() {
+	# see http://www.shoup.net/ntl/doc/tour-unix.html
+	./configure CXX="$CXX" CXXFLAGS="$CXXFLAGS" LIBTOOL="libtool" \
+		PREFIX="/usr" SHARED="on" NTL_GF2X_LIB="on" \
+		NATIVE="$(vopt_if native_build 'on' 'off')"
+}
+
+ntl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share
+	}
+}
diff --git a/srcpkgs/ntl/update b/srcpkgs/ntl/update
new file mode 100644
index 000000000000..7ca2974b146f
--- /dev/null
+++ b/srcpkgs/ntl/update
@@ -0,0 +1 @@
+site="https://libntl.org/download.html"

From 42c741c2295c4b423407f0bf40ea4f2ab6595275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Feb 2018 22:42:49 -0300
Subject: [PATCH 663/904] New package: flintlib-2.8.0

---
 common/shlibs             |  1 +
 srcpkgs/flintlib-devel    |  1 +
 srcpkgs/flintlib/template | 26 ++++++++++++++++++++++++++
 srcpkgs/flintlib/update   |  3 +++
 4 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/flintlib-devel
 create mode 100644 srcpkgs/flintlib/template
 create mode 100644 srcpkgs/flintlib/update

diff --git a/common/shlibs b/common/shlibs
index 773f18ca4156..e6d874c100b1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3986,6 +3986,7 @@ libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
+libflint.so.16 flintlib-2.8.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/flintlib-devel b/srcpkgs/flintlib-devel
new file mode 120000
index 000000000000..7c2633183069
--- /dev/null
+++ b/srcpkgs/flintlib-devel
@@ -0,0 +1 @@
+flintlib
\ No newline at end of file
diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
new file mode 100644
index 000000000000..078ed5316427
--- /dev/null
+++ b/srcpkgs/flintlib/template
@@ -0,0 +1,26 @@
+# Template file for 'flintlib'
+pkgname=flintlib
+version=2.8.0
+revision=1
+wrksrc="flint-${version}"
+build_style=configure
+configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-ntl=/usr"
+makedepends="mpfr-devel ntl-devel"
+short_desc="Fast Library for Number Theory"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="LGPL-2.1-or-later"
+homepage="https://flintlib.org"
+distfiles="https://flintlib.org/flint-${version}.tar.gz"
+checksum=584235cdc39d779d9920eaef16fe084f3c26ffeeea003a3fff64a20a0f33449e
+
+CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
+
+flintlib-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} mpfr-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/flintlib/update b/srcpkgs/flintlib/update
new file mode 100644
index 000000000000..21d6ab4bae5b
--- /dev/null
+++ b/srcpkgs/flintlib/update
@@ -0,0 +1,3 @@
+# package was named 'flintlib' because of another package
+pkgname=flint
+site="https://flintlib.org/downloads.html"

From 1ace77b7c9233eff1c6d28bb76833c707af1d097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 4 Feb 2018 01:00:19 -0300
Subject: [PATCH 664/904] New package: arb-2.20.0

---
 common/shlibs        |  1 +
 srcpkgs/arb-devel    |  1 +
 srcpkgs/arb/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/arb-devel
 create mode 100644 srcpkgs/arb/template

diff --git a/common/shlibs b/common/shlibs
index e6d874c100b1..5f935c176c25 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3987,6 +3987,7 @@ libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
 libflint.so.16 flintlib-2.8.0_1
+libarb.so.2 arb-2.20.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/arb-devel b/srcpkgs/arb-devel
new file mode 120000
index 000000000000..456b9f00a86c
--- /dev/null
+++ b/srcpkgs/arb-devel
@@ -0,0 +1 @@
+arb
\ No newline at end of file
diff --git a/srcpkgs/arb/template b/srcpkgs/arb/template
new file mode 100644
index 000000000000..f195d8babf12
--- /dev/null
+++ b/srcpkgs/arb/template
@@ -0,0 +1,28 @@
+# Template file for 'arb'
+pkgname=arb
+version=2.20.0
+revision=1
+build_style=configure
+configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-flint=/usr"
+makedepends="flintlib-devel"
+short_desc="C library for arbitrary-precision interval arithmetic"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="LGPL-2.1-or-later"
+homepage="https://arblib.org"
+distfiles="https://github.com/fredrik-johansson/arb/archive/${version}.tar.gz"
+checksum=d2f186b10590c622c11d1ca190c01c3da08bac9bc04e84cb591534b917faffe7
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# on glibc this would give a conflict with function fdiv()
+	CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
+fi
+
+arb-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 92a45b3cf4f25b34c08ced5ba58916c83d6d10a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 1 Jun 2020 14:50:01 -0300
Subject: [PATCH 665/904] New package: eclib-20210625

---
 common/shlibs          |  1 +
 srcpkgs/eclib-devel    |  1 +
 srcpkgs/eclib/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/eclib-devel
 create mode 100644 srcpkgs/eclib/template

diff --git a/common/shlibs b/common/shlibs
index 5f935c176c25..dd7d30a3cbda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3988,6 +3988,7 @@ libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
 libflint.so.16 flintlib-2.8.0_1
 libarb.so.2 arb-2.20.0_1
+libec.so.8 eclib-20210625_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/eclib-devel b/srcpkgs/eclib-devel
new file mode 120000
index 000000000000..d29e610e9249
--- /dev/null
+++ b/srcpkgs/eclib-devel
@@ -0,0 +1 @@
+eclib
\ No newline at end of file
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
new file mode 100644
index 000000000000..3db0bd2119b9
--- /dev/null
+++ b/srcpkgs/eclib/template
@@ -0,0 +1,29 @@
+# Template file for 'eclib'
+pkgname=eclib
+version=20210625
+revision=1
+build_style=gnu-configure
+configure_args="--with-flint --with-boost"
+hostmakedepends="automake autoconf-archive libtool"
+makedepends="pari-devel ntl-devel flintlib-devel boost-devel"
+short_desc="Elliptic curve library, includes mwrank"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/JohnCremona/eclib"
+distfiles="https://github.com/JohnCremona/eclib/archive/refs/tags/${version}.tar.gz"
+checksum=00333fd36afd237c9e6e410c7ab98536ddcd7fdc430e6837fe293247b835c572
+
+pre_configure() {
+	autoreconf -fi
+}
+
+eclib-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ntl-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 26b236765359e2d94b95345eca7209ea9864e40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 17 Aug 2021 17:02:18 -0300
Subject: [PATCH 666/904] pkgconf: update to 1.8.0, split -devel and
 libpkgconf.

We used to ship a static library in the main package, which was
accidental. We now ship it in pkgconf-devel package.
---
 common/shlibs            |  1 +
 srcpkgs/libpkgconf       |  1 +
 srcpkgs/pkgconf-devel    |  1 +
 srcpkgs/pkgconf/template | 25 ++++++++++++++++++++-----
 4 files changed, 23 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/libpkgconf
 create mode 120000 srcpkgs/pkgconf-devel

diff --git a/common/shlibs b/common/shlibs
index dd7d30a3cbda..ca7bd26dfd69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3563,6 +3563,7 @@ libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
+libpkgconf.so.3 libpkgconf-1.8.0_1
 libkodiplatform.so.19.0 kodi-platform-20180302_1
 libQuotient.so.0.6 libQuotient-0.6.6_1
 libipset.so.13 libipset-7.9_1
diff --git a/srcpkgs/libpkgconf b/srcpkgs/libpkgconf
new file mode 120000
index 000000000000..243cd47f2e6f
--- /dev/null
+++ b/srcpkgs/libpkgconf
@@ -0,0 +1 @@
+pkgconf
\ No newline at end of file
diff --git a/srcpkgs/pkgconf-devel b/srcpkgs/pkgconf-devel
new file mode 120000
index 000000000000..243cd47f2e6f
--- /dev/null
+++ b/srcpkgs/pkgconf-devel
@@ -0,0 +1 @@
+pkgconf
\ No newline at end of file
diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template
index e8acc8b1b9e4..dc020f562003 100644
--- a/srcpkgs/pkgconf/template
+++ b/srcpkgs/pkgconf/template
@@ -1,10 +1,9 @@
 # Template file for 'pkgconf'
 pkgname=pkgconf
-version=1.7.4
+version=1.8.0
 revision=1
 bootstrap=yes
 build_style=gnu-configure # cmake and meson also available
-configure_args="--disable-shared --disable-static"
 checkdepends="kyua"
 short_desc="Provides compiler and linker configuration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +11,7 @@ license="MIT"
 homepage="http://pkgconf.org/"
 changelog="https://raw.githubusercontent.com/pkgconf/pkgconf/master/NEWS"
 distfiles="https://distfiles.dereferenced.org/pkgconf/pkgconf-${version}.tar.xz"
-checksum=d73f32c248a4591139a6b17777c80d4deab6b414ec2b3d21d0a24be348c476ab
+checksum=ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf
 
 alternatives="
  pkg-config:pkg-config:/usr/bin/pkgconf
@@ -22,8 +21,24 @@ alternatives="
 post_install() {
 	vlicense COPYING
 
-	rm -rf $DESTDIR/usr/include
-
 	# Suffix file that conflicts with pkg-config
 	mv ${DESTDIR}/usr/share/aclocal/pkg.m4{,.pkgconf}
 }
+
+libpkgconf_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+pkgconf-devel_package() {
+	depends="libpkgconf>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 28b702421afe31ae75acc8225cc09d5fd22e1dfb Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Tue, 17 Aug 2021 11:10:09 +0100
Subject: [PATCH 667/904] zoxide: add shell completions

---
 srcpkgs/zoxide/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..4da6c900ca3b 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,7 +1,7 @@
 # Template file for 'zoxide'
 pkgname=zoxide
 version=0.7.3
-revision=1
+revision=2
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
 maintainer="Lorem <notloremipsum@protonmail.com>"
@@ -12,6 +12,9 @@ checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
+	vcompletion contrib/completions/zoxide.bash bash
+	vcompletion contrib/completions/zoxide.fish fish
+	vcompletion contrib/completions/_zoxide zsh
 	for f in man/*; do
 		vman $f
 	done

From 5f3083402d4dd170dab4d70836aa016876cf9b92 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 11:55:20 +0700
Subject: [PATCH 668/904] latte-dock: Update to 0.10.0

- update to 0.10.0
- homepage and changelog changed to official web
---
 srcpkgs/latte-dock/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/latte-dock/template b/srcpkgs/latte-dock/template
index 51ceaa3a1f69..7fc7eef92691 100644
--- a/srcpkgs/latte-dock/template
+++ b/srcpkgs/latte-dock/template
@@ -1,6 +1,6 @@
 # Template file for 'latte-dock'
 pkgname=latte-dock
-version=0.9.12
+version=0.10.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DENABLE_MAKE_UNIQUE=OFF
@@ -11,7 +11,7 @@ makedepends="knewstuff-devel libksysguard-devel libSM-devel plasma-framework-dev
 short_desc="Dock based on plasma frameworks"
 maintainer="Giuseppe Fierro <gspe+void@offlink.xyz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://phabricator.kde.org/source/latte-dock/"
-changelog="https://phabricator.kde.org/source/latte-dock/browse/master/CHANGELOG.md"
+homepage="https://invent.kde.org/plasma/latte-dock/"
+changelog="https://invent.kde.org/plasma/latte-dock/-/blob/master/CHANGELOG.md"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=b2b8af8c69eb122ccbbe987b00fff4d9d3ac9ccc939cbddae9fd319bca0630be
+checksum=967e129b437a1eb3bff0b045674f06bfacb02f0040da39738b7fc95cb1417812

From 5e6f179db96e7905826664faa1e4459ea70d7a01 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Mon, 16 Aug 2021 21:29:00 -0400
Subject: [PATCH 669/904] kopia: add bash and zsh completions.

---
 srcpkgs/kopia/template | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 9dac954fb965..709f34e80bd8 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,8 +1,9 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.8.4
-revision=1
+revision=2
 build_style=go
+build_helper="qemu"
 go_import_path=github.com/kopia/kopia
 go_ldflags="-X ${go_import_path}/repo.BuildVersion=${version}
  -X '${go_import_path}/repo.BuildInfo=Void Linux'"
@@ -12,3 +13,10 @@ license="Apache-2.0"
 homepage="https://kopia.io/"
 distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
 checksum=8e2663546fb426faacb4dd9425cdbba4fa2e8ca5df0aac0545d216c8e57d40ef
+
+post_install() {
+	for shell in bash zsh; do
+		vtargetrun ${DESTDIR}/usr/bin/${pkgname} --completion-script-${shell} > completions.${shell}
+		vcompletion completions.${shell} ${shell}
+	done
+}

From b9173790dfebb509755daac2021339facc5865c8 Mon Sep 17 00:00:00 2001
From: Savoy <root@savoyroad.io>
Date: Mon, 16 Aug 2021 18:30:11 -0500
Subject: [PATCH 670/904] wee-slack: update to 2.8.0

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

diff --git a/srcpkgs/wee-slack/template b/srcpkgs/wee-slack/template
index 08f56d3c7ddf..401c98002bb8 100644
--- a/srcpkgs/wee-slack/template
+++ b/srcpkgs/wee-slack/template
@@ -1,6 +1,6 @@
 # Template file for 'wee-slack'
 pkgname=wee-slack
-version=2.7.0
+version=2.8.0
 revision=1
 depends="weechat weechat-python python3-websocket-client"
 short_desc="WeeChat plugin for Slack.com"
@@ -8,7 +8,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/wee-slack/wee-slack"
 distfiles="https://github.com/wee-slack/wee-slack/archive/v${version}.tar.gz"
-checksum=da75962f97192ef5d10f5c7a0c72933aa1e4124ae0bfd84a1394f70f7d790b5b
+checksum=8a618230ce87c48d48c3432f51c19b3181df447dbc73952332bf99d5ec5dea24
 
 do_install() {
 	vinstall wee_slack.py 644 usr/lib/weechat/python/

From d1a5ce0b12b206dbf1ea45ffa1665ee4f13b1926 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 16 Aug 2021 21:18:03 +0200
Subject: [PATCH 671/904] stack: update to 2.7.3

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

diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 0d34d0ab9e2d..f9d573ef5bfd 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.7.1
-revision=2
-_stackage="lts-17.5"
+version=2.7.3
+revision=1
+_stackage="lts-18.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -12,8 +12,8 @@ license="BSD-3-Clause"
 homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="605bd8368b6fef9323ea71b79b08dd62270c49089a86b79fe67355f6b82cbc26
- d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
+checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
+ 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 2d79af2fe57c248058b1092e29f3d7eab8dd3c0f Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 16 Aug 2021 11:21:21 +0300
Subject: [PATCH 672/904] xtermcontrol: update to 3.8.

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

diff --git a/srcpkgs/xtermcontrol/template b/srcpkgs/xtermcontrol/template
index 015e1e6e3831..bed36d712774 100644
--- a/srcpkgs/xtermcontrol/template
+++ b/srcpkgs/xtermcontrol/template
@@ -1,11 +1,12 @@
 # Template file for 'xtermcontrol'
 pkgname=xtermcontrol
-version=3.7
+version=3.8
 revision=1
 build_style=gnu-configure
 short_desc="Enables dynamic control of xterm properties"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://thrysoee.dk/xtermcontrol"
-distfiles="http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"
-checksum=c2396cea504fd338f3ececbfa27c811bc580203577f2b9f16abae8ab5a13a112
+homepage="https://thrysoee.dk/xtermcontrol"
+changelog="https://raw.githubusercontent.com/JessThrysoee/xtermcontrol/master/ChangeLog"
+distfiles="https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"
+checksum=561e863620e48cd85a0fd53fddf1b62e930b377f4bde3454806fc541e1b5cf8d

From d6782ff11e0f2ceaa96465de56440d2b18ae20b5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 16 Aug 2021 22:06:22 +0400
Subject: [PATCH 673/904] python3-apsw: update to 3.36.0r1 and build with
 --enable=load_extension

---
 srcpkgs/python3-apsw/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-apsw/template b/srcpkgs/python3-apsw/template
index f646420cde57..bb3d9815d5d8 100644
--- a/srcpkgs/python3-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -1,21 +1,27 @@
 # Template file for 'python3-apsw'
 pkgname=python3-apsw
-version=3.32.2r1
-revision=3
+version=3.36.0r1
+revision=1
 wrksrc="apsw-${version/r/-r}"
 build_style=python3-module
+make_build_args="--enable=load_extension"
 hostmakedepends="python3-devel"
 makedepends="python3-devel sqlite-devel"
+checkdepends="python3-pytest $makedepends"
 short_desc="Another Python SQLite Wrapper (Python3)"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="Zlib"
 homepage="https://github.com/rogerbinns/apsw"
 changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.rst"
 distfiles="${homepage}/archive/${version/r/-r}.tar.gz"
-checksum=33f3ccfd8a7537dccef2caeb8cc06e26f300f1cf547c22c4e8ec8dcfecb72aa0
+checksum=133ee2291851e0144661eba25517c7feb026c6d5896df90ef7ea0feddf03a842
 
 pre_check() {
-	export PYTHONPATH=$(cd build/lib* && pwd)
+	$CC $CFLAGS -fPIC -shared -o ./testextension.sqlext src/testextension.c
+}
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 ./tests.py
 }
 
 post_install() {

From fe1c3666c6d724c4448e6ec37aea4ea0e5a20969 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 16 Aug 2021 22:07:42 +0400
Subject: [PATCH 674/904] calibre: update to 5.25.0.

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..ebd0161f93df 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.21.0
-revision=2
+version=5.25.0
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
@@ -11,11 +11,11 @@ hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-
  python3-zeroconf xdg-utils rapydscript-ng"
 makedepends="libinput-devel libmagick-devel libmtp-devel
  libpodofo-devel libwmf-devel libxkbcommon-devel python3-PyQt5-devel
- qt5-devel sqlite-devel tslib-devel hunspell-devel hyphen-devel"
+ qt5-devel sqlite-devel tslib-devel hunspell-devel hyphen-devel libstemmer-devel"
 depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
  python3-Markdown python3-Pillow python3-PyQt5-svg python3-zeroconf
  python3-PyQt5-webengine python3-PyQt5-webchannel python3-Pygments python3-apsw
- python3-css-parser python3-cssselect python3-dateutil python3-dbus
+ python3-css-parser python3-cssselect python3-dateutil python3-jeepney
  python3-dnspython python3-feedparser python3-html5-parser python3-mechanize
  python3-msgpack python3-netifaces python3-psutil python3-regex python3-html2text
  python3-pychm python3-cchardet qt5-webengine speech-dispatcher"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=458b6b2dcc6bcf63676c327277192e88333cf9545d89806855d31b4c17e20257
+checksum=5a6213a14368a863d4f753f7d3c11fc5b0529f614fe9e0a6e7c790aa789544f6
 lib32disabled=yes
 nocross=yes
 

From 16f7192c103e4c9dadb731ebcedd357514b14c93 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 16 Aug 2021 23:36:32 +0400
Subject: [PATCH 675/904] spdlog: update to 1.9.2.

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

diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..ec19e89f5f7a 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
+version=1.9.2
 revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,7 +13,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"

From 2bf80c79742ea7bcb8fa2251f916aee7799561f1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 13 Aug 2021 00:40:02 +0200
Subject: [PATCH 676/904] R: update to 4.1.1.

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

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..dad0e3b00421 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
-version=4.1.0
-revision=2
+version=4.1.1
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
@@ -13,16 +13,16 @@ makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
  zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel
- texlive texlive-fontsextra texinfo
  $(vopt_if openblas openblas-devel 'blas-devel lapack-devel')"
 depends="xdg-utils less which"
+checkdepends="texlive texlive-fontsextra texinfo"
 short_desc="System for statistical computation and graphics"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
 distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
-checksum=e8e68959d7282ca147360fc9644ada9bd161bab781bab14d33b8999a95182781
+checksum=515e03265752257d0b7036f380f82e42b46ed8473f54f25c7b67ed25bbbdd364
 nocross=yes
 shlib_provides="libR.so"
 make_check=extended

From cd0c7a0f7706a9506c55cdfd5ed1345a7e349662 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 16 Aug 2021 18:03:05 +0300
Subject: [PATCH 677/904] safeeyes: update to 2.1.3.

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

diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index a321edd43855..071aa2f82c9c 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,15 +1,16 @@
 # Template file for 'safeeyes'
 pkgname=safeeyes
-version=2.0.9
-revision=4
+version=2.1.3
+revision=1
 build_style=python3-module
-pycompile_module="safeeyes"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
+makedepends="python3-devel cairo-devel libgirepository-devel"
 depends="python3-psutil libappindicator python3-gobject python3-Babel
  python3-dbus xprop alsa-utils python3-xlib"
+checkdepends="$depends"
 short_desc="Tool to reduce and prevent repetitive strain injury"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://slgobinath.github.io/SafeEyes/"
 distfiles="${PYPI_SITE}/s/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e2410e5203fd3801e88536fc9b978a890f496a70b7bc91abf50d5488b634008f
+checksum=3db101a4ae86e824937b7ddfb56e7e464f5b2dc96a351feaccadee080f42bcac

From 13e670bdd622e961ea59b2d5b9286d4b1119bfdd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 23:38:35 +0300
Subject: [PATCH 678/904] planner: update to 2.7.

Also:
- add needed dependencies
- add update file.
---
 srcpkgs/planner/template | 9 +++++----
 srcpkgs/planner/update   | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/planner/update

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 5b331ba8c2f3..7be79ab4c6ba 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,19 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.6.9
+version=2.7
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="gettext pkg-config vala glib-devel"
+hostmakedepends="gettext pkg-config vala glib-devel curl"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel libpeas-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel libhandy1-devel"
+depends="io.elementary.icons io.elementary.stylesheet curl"
 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=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
+checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"
diff --git a/srcpkgs/planner/update b/srcpkgs/planner/update
new file mode 100644
index 000000000000..17b54fd761db
--- /dev/null
+++ b/srcpkgs/planner/update
@@ -0,0 +1,2 @@
+# 6.2.3 is an old release, tagged by mistake
+ignore="6.2.3"

From 675dcc0c9f1f75d43d5128ae0cd0e2acb3a74770 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 7 Aug 2021 13:53:00 +0200
Subject: [PATCH 679/904] New package: libfreeaptx-0.1.1

---
 common/shlibs                |  1 +
 srcpkgs/libfreeaptx-devel    |  1 +
 srcpkgs/libfreeaptx/template | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/libfreeaptx-devel
 create mode 100644 srcpkgs/libfreeaptx/template

diff --git a/common/shlibs b/common/shlibs
index ca7bd26dfd69..63dea0e2ea0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3998,6 +3998,7 @@ libspdlog.so.1 libspdlog-1.8.2_2
 libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
+libfreeaptx.so.0 libfreeaptx-0.1.1_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/libfreeaptx-devel b/srcpkgs/libfreeaptx-devel
new file mode 120000
index 000000000000..fe4a33a76eb2
--- /dev/null
+++ b/srcpkgs/libfreeaptx-devel
@@ -0,0 +1 @@
+libfreeaptx
\ No newline at end of file
diff --git a/srcpkgs/libfreeaptx/template b/srcpkgs/libfreeaptx/template
new file mode 100644
index 000000000000..81306855682a
--- /dev/null
+++ b/srcpkgs/libfreeaptx/template
@@ -0,0 +1,21 @@
+# Template file for 'libfreeaptx'
+pkgname=libfreeaptx
+version=0.1.1
+revision=1
+build_style=gnu-makefile
+short_desc="Open Source implementation of Audio Processing Technology codec (aptX)"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/iamthehorker/libfreeaptx/"
+distfiles="https://github.com/iamthehorker/libfreeaptx/archive/refs/tags/$version.tar.gz"
+checksum=7acf514446cae59585d9bc21e4f98f4a3856f4741c3a7a09d06e8ac5bf2f7315
+
+libfreeaptx-devel_package() {
+	depends="libfreeaptx>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 08d00cb67c15ee69a48b5de3bcba1c3fa3b5b6da Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 6 Aug 2021 23:28:40 +0200
Subject: [PATCH 680/904] pipewire: update to 0.3.33

Set auto-features=enabled because we want the majority of the auto features
enabled and to avoid relying on auto-detection.
In addition, this update enables echo-cancel-webrtc, libpulse and avahi
---
 srcpkgs/pipewire/patches/gettid.patch | 64 ---------------------------
 srcpkgs/pipewire/template             | 27 +++++++----
 2 files changed, 18 insertions(+), 73 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/gettid.patch

diff --git a/srcpkgs/pipewire/patches/gettid.patch b/srcpkgs/pipewire/patches/gettid.patch
deleted file mode 100644
index 0911051e1a0c..000000000000
--- a/srcpkgs/pipewire/patches/gettid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From master, will be in 0.3.33
-diff --git a/meson.build b/meson.build
-index 838fb66be8ca0e2d66009696f6c00c2ff7580b6e..977ce9ba1f22a2785efcb1b5a5bee08cf2e4bec3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -254,6 +254,9 @@ endif
- if cc.has_function('getpagesize', prefix : '#include<unistd.h>')
-   cdata.set('HAVE_GETPAGESIZE', 1)
- endif
-+if cc.has_function('gettid', prefix : '#include<unistd.h>', args: [ '-D_GNU_SOURCE' ])
-+  cdata.set('HAVE_GETTID', 1)
-+endif
- if cc.has_function('clock_gettime', prefix : '#include <time.h>')
-   cdata.set('HAVE_CLOCK_GETTIME', 1)
- endif
-diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
-index 1f13aa371192bee738c4e10b45917473d2f9856d..7d55fb758cdc0a3073e3e3f2536949e824ffa223 100644
---- a/src/modules/module-rtkit.c
-+++ b/src/modules/module-rtkit.c
-@@ -182,12 +182,16 @@ void pw_rtkit_bus_free(struct pw_rtkit_bus *system_bus)
- 
- static pid_t _gettid(void)
- {
--#ifndef __FreeBSD__
-+#if defined(HAVE_GETTID)
- 	return (pid_t) gettid();
--#else
-+#elif defined(__linux__)
-+	return syscall(SYS_gettid);
-+#elif defined(__FreeBSD__)
- 	long pid;
- 	thr_self(&pid);
- 	return (pid_t)pid;
-+#else
-+#error "No gettid impl"
- #endif
- }
- 
-diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
-index de30f4123cf017f8be2eb7d4cd3bababb51da6fc..419e4be815a46d0f466969a02813f481d48ee5a1 100644
---- a/src/modules/module-rtkit.c
-+++ b/src/modules/module-rtkit.c
-@@ -518,7 +518,7 @@ static void *custom_start(void *data)
- 	struct impl *impl = this->impl;
- 
- 	pthread_mutex_lock(&impl->lock);
--	this->pid = gettid();
-+	this->pid = _gettid();
- 	pthread_cond_broadcast(&impl->cond);
- 	pthread_mutex_unlock(&impl->lock);
- 
-diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
-index 419e4be815a46d0f466969a02813f481d48ee5a1..1f13aa371192bee738c4e10b45917473d2f9856d 100644
---- a/src/modules/module-rtkit.c
-+++ b/src/modules/module-rtkit.c
-@@ -592,7 +592,7 @@ static pid_t impl_gettid(struct impl *impl, pthread_t pt)
- 	if ((thr = find_thread_by_pt(impl, pt)) != NULL)
- 		pid = thr->pid;
- 	else
--		pid = getpid();
-+		pid = _gettid();
- 	pthread_mutex_unlock(&impl->lock);
- 
- 	return pid;
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..fcd2617e2cad 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,15 +1,24 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.32
-revision=2
+version=0.3.33
+revision=1
 build_style=meson
-configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
- -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
+configure_args="
+ --auto-features=enabled
+ -Db_ndebug=false
+ -Ddocs=enabled
+ -Dlibcamera=disabled
+ -Droc=disabled
+ -Dsdl2=$(vopt_if sdl2 enabled disabled)
+ -Dsystemd=disabled
+ -Dudevrulesdir=/usr/lib/udev/rules.d
+ -Dvulkan=enabled
+"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
- libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
- libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
+makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
+ sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
+ libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
+ vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
 short_desc="Server and user space API to deal with multimedia pipelines"
@@ -18,7 +27,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=8b2af6138529fd9214dd148f2a6304f13c16e0b0d3a4a98c1afa87b7e65c574f
+checksum=f60662be410523cbb767dbee81156f9e9e3bd2b06d0ea21e94c11eb7a6530bcc
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 

From 7e5f99aa1ad4beb1c2fea53ed06fd6436704a579 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 18 Aug 2021 20:45:04 +0200
Subject: [PATCH 681/904] google-chrome: update to 92.0.4515.159.1

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

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..a61b1ed7fd69 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.159.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=05a5406e4564d6fe117e21230551516a7720cb211fc2b9b9367c868cb7c6b653
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 4a377d7a51c3b6b7cbc0e08f69a05d274d633f9a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 18 Aug 2021 16:31:12 -0400
Subject: [PATCH 682/904] NetworkManager: update to 1.32.10

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

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index a35b51d7b76b..5f910c694856 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.32.2
+version=1.32.10
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -34,7 +34,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873
+checksum=3e5ccc66805659e3f11a718e3a599f9726b79a01d6ff14814be6ad8bc5da8bb8
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes

From 4ece03dd5802301789d3d29afd7e7af556c0148b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 18 Aug 2021 16:33:11 -0400
Subject: [PATCH 683/904] network-manager-applet: update to 1.24.0

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

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index e9bb40aa3e6f..958d5b228960 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,6 +1,6 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.22.0
+version=1.24.0
 revision=1
 build_style=meson
 configure_args="-Dselinux=false"
@@ -16,5 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c70d80b48d40a9cb99ec967cc4389f67e7f0301528a69d481572041331a646be
+checksum=b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58
 lib32disabled=yes

From 2fd6485841b3635dbf398ae7276df2431a73da8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 15 Jun 2021 10:00:33 -0400
Subject: [PATCH 684/904] alsa-ucm-conf: update to 1.2.5.1

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

diff --git a/srcpkgs/alsa-ucm-conf/template b/srcpkgs/alsa-ucm-conf/template
index 1a222b9e3cc3..b77f180ee40f 100644
--- a/srcpkgs/alsa-ucm-conf/template
+++ b/srcpkgs/alsa-ucm-conf/template
@@ -1,13 +1,13 @@
 # Template file for 'alsa-ucm-conf'
 pkgname=alsa-ucm-conf
-version=1.2.4
+version=1.2.5.1
 revision=1
 short_desc="ALSA Use Case Manager topology configurations"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/alsa-project/alsa-ucm-conf"
-distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
-checksum=2c3b535c77dcb9aaf62a61f4f8324f1ab184162f105f7ec9ed1e37c742fcd340
+distfiles="https://github.com/alsa-project/${pkgname}/archive/refs/tags/v${version}.tar.gz"
+checksum=d4016aaf8c84218713ba9e2098424a219b597e508bcddeac193fc28daf47c4e0
 
 do_install() {
 	vdoc ucm2/README.md

From 1ab4eb46aba07512eff044367a53ede1cb995ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 4 Jun 2021 12:16:35 -0300
Subject: [PATCH 685/904] alsa-lib: update to 1.2.5.1.

---
 ...lugin_dir_set-snd_plugin_dir-must-be.patch | 32 -------------------
 srcpkgs/alsa-lib/patches/stdint_compat.patch  | 14 --------
 srcpkgs/alsa-lib/template                     |  6 ++--
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
 delete mode 100644 srcpkgs/alsa-lib/patches/stdint_compat.patch

diff --git a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
deleted file mode 100644
index a89f8587bb1d..000000000000
--- a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 22 Oct 2020 20:57:32 +0200
-Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
- declared even for \!DL_ORIGIN_AVAILABLE
-
-Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
-BugLink: https://github.com/alsa-project/alsa-lib/issues/91
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/dlmisc.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/dlmisc.c b/src/dlmisc.c
-index c9517c55..f20eb593 100644
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -42,11 +42,9 @@
- #ifndef PIC
- struct snd_dlsym_link *snd_dlsym_start = NULL;
- #endif
--#ifdef DL_ORIGIN_AVAILABLE
- static int snd_plugin_dir_set = 0;
- static char *snd_plugin_dir = NULL;
- #endif
--#endif
- 
- #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
- static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
--- 
-2.29.0
-
diff --git a/srcpkgs/alsa-lib/patches/stdint_compat.patch b/srcpkgs/alsa-lib/patches/stdint_compat.patch
deleted file mode 100644
index 0ff7b4124765..000000000000
--- a/srcpkgs/alsa-lib/patches/stdint_compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t
-for compatibility with musl libc
-
---- a/include/pcm.h	2015-02-26 13:34:52.000000000 +0100
-+++ a/include/pcm.h	2015-07-28 13:44:32.423885625 +0200
-@@ -29,6 +29,8 @@
- #ifndef __ALSA_PCM_H
- #define __ALSA_PCM_H
- 
-+#include <stdint.h>	/* uint_ types */
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index 454ede71606e..b687456db813 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'alsa-lib'
 pkgname=alsa-lib
-version=1.2.4
-revision=2
+version=1.2.5.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libtool"
 short_desc="Advanced Linux Sound Architecture (ALSA) library"
@@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-or-later"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
-checksum=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7
+checksum=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e
 
 alsa-lib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d67ba49bc2c892557506b723879a0fedf7b6152a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Aug 2021 19:46:39 +0300
Subject: [PATCH 686/904] notcurses: update to 2.3.15.

---
 ...6a2480f047b3d4517a8d4db9a9a43d523fe84.diff | 31 +++++++++++++++++++
 srcpkgs/notcurses/template                    |  4 +--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/notcurses/patches/6296a2480f047b3d4517a8d4db9a9a43d523fe84.diff

diff --git a/srcpkgs/notcurses/patches/6296a2480f047b3d4517a8d4db9a9a43d523fe84.diff b/srcpkgs/notcurses/patches/6296a2480f047b3d4517a8d4db9a9a43d523fe84.diff
new file mode 100644
index 000000000000..62dd0d3e7dbf
--- /dev/null
+++ b/srcpkgs/notcurses/patches/6296a2480f047b3d4517a8d4db9a9a43d523fe84.diff
@@ -0,0 +1,31 @@
+diff --git a/src/compat/compat.h b/src/compat/compat.h
+index 72da2c3b1..a28439193 100644
+--- a/src/compat/compat.h
++++ b/src/compat/compat.h
+@@ -3,13 +3,6 @@
+ 
+ #ifdef __cplusplus
+ extern "C" {
+-#ifdef __linux__
+-#define NOEXCEPT noexcept
+-#else
+-#define NOEXCEPT
+-#endif
+-#else
+-#define NOEXCEPT
+ #endif
+ 
+ #include <time.h>
+@@ -79,10 +72,10 @@ int clock_nanosleep(clockid_t clockid, int flags,
+                     const struct timespec *request,
+                     struct timespec *remain);
+ 
+-char* strndup(const char* str, size_t size) NOEXCEPT;
+-
+ #ifdef __cplusplus
+ }
++#else
++char* strndup(const char* str, size_t size);
+ #endif
+ 
+ #endif
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..bf3105ee75c3 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.15
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=146e83723e5f5c486b9f16ec11b70ad682e76b6d01f10e4d9c27d07f3de72811
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From bce82d5c38d163a2dbb58e0957446fae407423ea Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 19 Aug 2021 01:12:45 +0200
Subject: [PATCH 687/904] firefox: update to 91.0.1.

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

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..dd6cee3087f7 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=91.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=b95854ec9cb3e4409e5a1cf203c2b228146c6e3f9f3240d304cecec6b256f962
 
 lib32disabled=yes
 

From 43c930eb4337fe5ceade8406f6180d0431e63d05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 19 Aug 2021 01:14:52 +0200
Subject: [PATCH 688/904] firefox-i18n: update to 91.0.1.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..b2a1b37cdd2c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=91.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="eb3b2ffd75464d89a153cc3bbf63d31db7c5188c1fc66b2e2038453b6b9975f8
+ f6ff4417f5ca1e5d365d90b084052f280095c222da6685c58e3687083c86631f
+ 450f592913f0ba9bd125f333986bd5e17060b30e3a333bdbaff7fe7d9c9c2938
+ c24371f016dd2812c386618ed62332d033b7e83a7e6d95dd1f46fdd0060bbe23
+ 1b9127de59087432b6a3e47fb7de4204a6a886bd58bfecebef4bba6a85edb84e
+ 7f95abb67a2b745659b554acbde83e2ec8e1eb435614f1db0bdbb7375af0dd86
+ 725af8e4cb00b15207d89903db4e14dd6f6f50ea3723e8767e63d2fa143422c6
+ 03e30ee16ac136bf1b51cba4d27d6d71900f4573c6ce07cf75e256318622531c
+ 969777bbedfe7e7ad0d896aed8784daffd0652600bf88d72897b041a9e0d16a7
+ c0844985ab45413e1605a882c346451c0623c1a7761eba430ee8add0d4b14505
+ f7f118ed7969820e83db358464d83b1c4d7b86473accf33e5c641a4885202124
+ 01080ed8909671f737c0e29aa4bbe1daaef562429f902d1b92f55c8d8c76a5c8
+ 3af4bab7b1e3fe602d6a7def646a5c5c5163eb9e5a97dcdebdf3501d767f521f
+ f74a7466d4b7eb882d30d2ebc7ec11cb8dc9d1bd9a978691656764cdfa4c0b12
+ 7b561fae0e34a736786bbdca50748c6004e9137eeb6895b2747c6d61be35eba4
+ 25d8f11686f0ba1339882e8054ad20a46247eaf764653e1dcc87b0dd8103565a
+ 78d1a69660d5261d5ec8951228456c2ea65ecaf9c85e0d4d00be938cfdbfae42
+ 9bd68619eb743005da269ad1260673c4a1900ea9cbadfc77c0075ec09079e260
+ 319f45c1537998c1e095b643a2b1586698e0d75502b07a3842fbd341a1a4bdee
+ 5e360c2d7fb9c52d62acc583598bee8c4933b3f89623dcd9a4ef1a5024540fa6
+ 5993697f98a4a7fcc6f76809556a8952461a85d79b700631e575c2daa4e0a657
+ 741fb8348f9002d87f5f92a2c6b219ae9466a2a1d5acfa67fc5d67cfd0a75345
+ 08dd96cd7e5e016b79a81193cbda6b65b30d3470e27ddcba77026957cf90fdd9
+ 9c03083f06d012f600a2821b55f3c2fb07eab7924292d1dbd5ccb4876657f512
+ 67af8b9d13d1dd83c4a9851b80cecb11c78d53987ec34927766f7d15c5b8e56b
+ c743bf070d5a23cc2376e0108d1f7d253849f053b8191624c95483c5bd98983d
+ 20cae1943c3e35dc91f8e1a099684e2fba273306c19d1ce16ab7c3c949a11b27
+ 9837333fe534b2514202d58b1cf9b796e38aaa80a2b462982cad74d70b144181
+ 2b9b2ce2a120cf13547fde1cdec860d3528c56f973772afbe37562afa0a359a2
+ 644a54463df55d981d3b786d4f239954e2535fef1527f95da0f02e68f101fda1
+ 5dd3ec2527ddd4bf38e1fcafc0302e33b6ff6c8f7af2a30317b9e3fb04982e6d
+ e04a58752aa34e9b1a093b4d386c25b0d18bc7d98cb1e3d636ccc04a24bb5b4d
+ 100ad5887e4755ccb6971017adf385cfec5ba3d00dfd13c1942d65aff2766984
+ ab8d542ade53c56c147a3a17835cf8c3c6284c777eac18934bb30ffd9ab2ef29
+ cb654ef29e9e8b5f207479dc669c33f7c640395dcfcbee68ae53e9e4209ba849
+ e86da3b31a52f428a1414b447ddcf018a7c4d139e17c07876c1768465e33f00d
+ aa9b65ed7b673bb8fd6063d54d95085c4298c39e0b1717405c91a9604f20c9a5
+ 9e97ff6d2a04a52b3de53054ccaebdfd3d12f0371529591d3d9813f458f0449a
+ 10ccdce6fbc5424bee78b31b86f0cb32a8587142ee029fadaa1863a0f34519b1
+ 6ac9f5458e8a9f3e9ce5fe5e95f14d8ac5983b1876882589ec93a1b6fb4ed3a1
+ fc39067a893a1997a7c9faed40f8d5212395d81ac1bad414e06621e7c3492e14
+ f803c5ea021014470b9be91cd6951e24e62f95cd734b1a7dc634eb9e31cef530
+ 79c652dcde0978e3eb6851c575bf7040d2199f401de3ceb3f09014b9fb8781f3
+ 8e054c4c0e80f95255d5c88872396c6d1a9a40858aaf6949f58b04c9545ff026
+ 934264a22ab534d57dd4018d48260887562b6d427d0d86077ae33067b552a467
+ 333be6ede2c0a3c227bc27d4c495af29a961f002377daa768258d7c9915854e1
+ 00cd9c4dc09f8ad5b5947c6e2d4c979584451dec28df0ee8f46bcecb215dd4f5
+ 274c481eb00ae38d7ec4ee1af0813a6a7eac6ca11551322e38a02cfa12e17e04
+ 3c91adb7eea612140433544057963aa29ef38420caf5cb39d611ee17d884f5ba
+ 477171beef54aaa399c372e0e93fe926b5318b2cda6f72b82497f886b6b8a4bd
+ 8b9a26eaa87b20a72f77bb4e46bb65a1d3b44de1ac207fef23a453c35f002e99
+ 2799fb8a388d48284a089bf026b8c8dc67acdfd9e44e061c2345d0c1f88b903a
+ 38297bd3833e910636c82504377dcacb41b4f910f47560c50f20252fee00aeca
+ 7482e894a90e149d29bbc82b3813113050e742f52eaee76ebda5e15466438516
+ edbf56247333d159c44683fd24fa2f51201a688c2097a30dae81814d62838086
+ 70797dcde33a5c62cd95ca8ea906ef7eb06cebb99d9af543ae1ab01f1b29210e
+ 96eced92fa12855b9de0b6b9efb01f8c38bc7cb80abbed927747276236608193
+ df88733b9aa7bb84b607a349460392204c4f9d7af3229f3886ba223afed036cb
+ e1c0e6df8c87fecfdc9cf588f982a2dda2f455de7322bff4ff80d74439d69bce
+ e1479ee06d698ec4751e973a456ddc5a32314c0c0f45f945bb27a52c04f860c9
+ 7e790e93e67afed3c2a8beffe4746aedb4b404ceea216ca66680be2e7076a637
+ 52f0813542f7b25bd916c6d6f4db1861a89c0a9db742973e7240d6b35be10704
+ 700d167f23ad56241a4a60da6bb2bd61ed56b7a66812b1e24683db6b965cffcc
+ b423c7ebac74d7c240b0b8f486f84bc13086134f480fe740bf0d3db78ded645e
+ 746d7976e70c6ba4270ab9b993300aca020e2a17e0523a5414493e1cf520042d
+ b35c23548dc2ec1dfa71b92300c804902624528b95ce436f236b4cd63a368c29
+ 09142b4477d2d143ef7e3f27ab736541f83982e644c5dfcf0e3e5e14d36cad02
+ 213e59cf681593de4baba765708e596ff45d431f5eb6fd96cecfc4e025bb08bd
+ 5cdf1ce3cf1cfbc938b9c45d2f45611321d2ddfbd279cc1afe002cbc6f89c5ae
+ 306a9eeac46260f11752c0c35c37c2155110a2b52a0d3fadb64d34f6a582cf78
+ 1bb797f2373ed8619dc486238b28393a2d6aed0b914bc85d95d2869a8b1d0ae9
+ 0236a4b7b66ea5b57f87a385a25e13605ef6b2858c19f08485e3636330a73204
+ b2d21e507d66f1b5420d4366b69c6cd54f4a13894643d67eb5eb8d1eb05efc0e
+ 57eb8498fdbb2d340684548b28b29175dea379ec1fd89f5041c02a863a81ffa0
+ 7add528780dbc73f6933d7ad0a79467acd0b06b1c83006afe10b06c1ae8c2c16
+ 0fcc15e03f2eee79a2af71cd443944b11c9e91477e39c4d0f7a36e6ed5f869e5
+ c990f156347ac95e75f0f701129ac83913906ada727d39951fd3fbd4b207bc39
+ af05bca93168a2d7c18b57fdac4624718b4b7f7bc73d81c730bb86ce90dd4b3a
+ 186352a3618085cff0688afd4c04e66d0720d4a589008562760fbae9fb5202e6
+ 8b61f3b4e4f5f807422006a309f8c0d8b7a5803a19ecb9e5a020e409ae7008ca
+ b5a847b059fa039fa8986f460d0a7d06c2a5da897fc8a2c7086f161840fc6ddd
+ ba9e7bb172390c12deb0136784835d9d3e5983ee07db117454c3378b7ede421f
+ cc522b8b5e32fc8351fc483498cc2ccb0442e11e7c7adf84283cc0236cb5cd01
+ 21df05341bbd5a5b26924cbd9e8bc1876506bcc9a00fa7e921ab292a57b66c66
+ 03c1b8610d2145232bb6eb599869e383d3b17b5005ee720f8cbd2a99c9e40505
+ ae1f643c6af9735422221361cf3eda1e5fe20fd4872552c9dd8cf8b6953bc893
+ d879fde2beb098f9828c0276a5afdcb2d16e0b82e29bdf2d40347127b039205c
+ 124c8aa0f3a79c954900763835cef68c834bb681297a90142f852846f51eb7fb
+ 0df55aadab5ad987c206b3c2103180e1c42609b02dac2956c6faae71efde6b4a
+ 25ad11306e2fb1175aa77cfc5fc1fb62f9800e7ca6802b5b2d25ddda77589813
+ 2d399810c928cc79791d2b494671f35e54d79f657f6fa395dc831b279b66f0a9
+ e6b5a23c2dc9ecdeeb3f513c2e3975f752f7eec71bc540e1d198cf429b785eb0
+ 75efa11ec08b12e15b7eca45c88b363cc5c5e6fc7f7ed344f39b5b05f321b588
+ de745c37497e9b7cf03d6971b0e409b131f29485e9c68e7dd54beda2cf7af3fa
+ c86eaa393e6737c940bc90606af536b25ffb992f9dc653fc3e3e6e9a360a4156
+ d97cccdd48d6c64d93869d1904a12de9ee914b069f89e92d4f88c4f2ff59d8f1"

From bf4095079690726cb9a5ca68b7c1e0ffc884e7a7 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 16 Aug 2021 11:14:15 +0300
Subject: [PATCH 689/904] yq: update to 2.12.2.

and cleanup dependencies.
---
 srcpkgs/yq/patches/fix-test-on-ci.patch | 15 +++++++++++++++
 srcpkgs/yq/template                     | 10 +++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/yq/patches/fix-test-on-ci.patch

diff --git a/srcpkgs/yq/patches/fix-test-on-ci.patch b/srcpkgs/yq/patches/fix-test-on-ci.patch
new file mode 100644
index 000000000000..3ae4d675426d
--- /dev/null
+++ b/srcpkgs/yq/patches/fix-test-on-ci.patch
@@ -0,0 +1,15 @@
+https://github.com/kislyuk/yq/issues/114
+
+diff --git a/test/test.py b/test/test.py
+index f25dced..ffa7147 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -77,7 +77,7 @@ class TestYq(unittest.TestCase):
+         unusable_tty_input = mock.Mock()
+         unusable_tty_input.isatty = mock.Mock(return_value=True)
+ 
+-        self.run_yq("{}", [], expect_exit_codes={0} if sys.stdin.isatty() else {2})
++        self.run_yq("{}", [], expect_exit_codes={0})
+         self.run_yq("{}", ["."])
+         self.run_yq(unusable_non_tty_input, [".", test_doc])
+         self.run_yq(unusable_non_tty_input, [".", test_doc, test_doc])
diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index 2ad24598f3fd..4d959b5d4bee 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -1,18 +1,18 @@
 # Template file for 'yq'
 pkgname=yq
-version=2.11.1
-revision=2
+version=2.12.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-yaml"
-depends="python3-setuptools python3-xmltodict python3-yaml python3-toml python3-argcomplete"
-checkdepends="jq python3-xmltodict python3-toml python3-argcomplete"
+depends="${makedepends} python3-xmltodict python3-toml python3-argcomplete jq"
+checkdepends="${depends}"
 short_desc="Command-line YAML processor written in Python that wraps around jq"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/kislyuk/yq"
 distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz"
-checksum=74f64e3784a34d8a18efd8addc83cf5ca3478a0a69517d70fd9158a3809f99e0
+checksum=2f156d0724b61487ac8752ed4eaa702a5737b804d5afa46fa55866951cd106d2
 
 do_check() {
 	python3 test/test.py

From 607ccf754e16d70998b6c3f03b6dfdb2ab5bea3c Mon Sep 17 00:00:00 2001
From: 674Y3r <87250374+674Y3r@users.noreply.github.com>
Date: Thu, 19 Aug 2021 03:51:11 +0200
Subject: [PATCH 690/904] kmines: update to 21.08.0.

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

diff --git a/srcpkgs/kmines/template b/srcpkgs/kmines/template
index 4c77e8a2c684..30af032cb6c0 100644
--- a/srcpkgs/kmines/template
+++ b/srcpkgs/kmines/template
@@ -1,6 +1,6 @@
 # Template file for 'kmines'
 pkgname=kmines
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kmines"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmines-${version}.tar.xz"
-checksum=915f82c380df1c3af9169f37214fdcf6089a4c453e737215d5881bf84363e80c
+checksum=81dbbde8c98115f0f66f945f711b851d61ba97f945691aa49c2d3f8e27a190ec

From 24f008a01f39e8a16f84d3ca2124ac4f9696a267 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 19 Aug 2021 15:31:51 +0200
Subject: [PATCH 691/904] breeze-icons: make nostrip to avoid wasting time

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

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..8c561a11b464 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -13,6 +13,7 @@ license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From 517e7395c6baaa45d4617dfe6d0057c8d1d1ed45 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 19 Aug 2021 15:48:01 +0200
Subject: [PATCH 692/904] grep: fix build on ppc-musl

---
 srcpkgs/grep/patches/ppc-musl.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/grep/patches/ppc-musl.patch

diff --git a/srcpkgs/grep/patches/ppc-musl.patch b/srcpkgs/grep/patches/ppc-musl.patch
new file mode 100644
index 000000000000..6ba37f233591
--- /dev/null
+++ b/srcpkgs/grep/patches/ppc-musl.patch
@@ -0,0 +1,14 @@
+--- a/lib/sigsegv.c
++++ b/lib/sigsegv.c
+@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+ /* both should be equivalent */
+ #   if 0
+ #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+-#   else
++#   elif defined(__GLIBC__)
+ #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
++#   else
++#    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
+ #   endif
+ #  endif
+ 

From ac3a68156427b0c99abcacbc9db7d44d4d0fb4fa Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 19 Aug 2021 15:53:17 +0200
Subject: [PATCH 693/904] SDL2: disable pipewire on ppcle

---
 srcpkgs/SDL2/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..57189b273d3c 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -19,7 +19,7 @@ checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
 build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -27,6 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	ppcle*) ;;
+	*) build_options_default+=" pipewire";;
+esac
+
 # SDL_cpuinfo includes altivec.h, which breaks C++ programs with vector keyword
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) configure_args+=" --disable-altivec";;

From 78c7bfa8806b0387919d2529c1e02d7f9912b8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 19 Aug 2021 10:21:13 +0200
Subject: [PATCH 694/904] croc: update to 9.3.0.

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

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..8595c5dd0268 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.3.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=a55153b4b13aae2986e4fe3e5f652228a83835bf27651e83a71750f4942c612d
 
 post_install() {
 	vlicense LICENSE

From 7482dbcf49f9d290d216d52b3a212d13ab9fa7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 19 Aug 2021 10:06:55 +0200
Subject: [PATCH 695/904] crispy-doom: update to 5.10.3.

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

diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..a995edf9bf92 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.3
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=eef8dc26e8952b23717be3b20239fda4ee59842511328387766d1c8fe8252f6b
 
 CFLAGS="-fcommon"
 

From 9d83f041d59434ff8e99af7e42f68623b00cbbdd Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 19 Aug 2021 11:34:48 +0200
Subject: [PATCH 696/904] libxkbcommon: enable xkbregistry

This is now needed by Waybar
---
 common/shlibs                 |  1 +
 srcpkgs/libxkbcommon/template | 17 ++++++++++++++---
 srcpkgs/libxkbregistry        |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/libxkbregistry

diff --git a/common/shlibs b/common/shlibs
index 63dea0e2ea0b..39136a41cfe3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1155,6 +1155,7 @@ libtomcrypt.so.1 libtomcrypt-1.18.0_1
 libHX.so.28 libHX-3.14_1
 libxkbcommon.so.0 libxkbcommon-0.2.0_1
 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
+libxkbregistry.so.0 libxkbregistry-1.3.0_3
 libgee-0.8.so.2 libgee08-0.8.2_1
 libnettle.so.8 nettle-3.6_1
 libhogweed.so.6 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 5cdadd1db7db..ed016aae5ee9 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,13 +1,16 @@
 # Template file for 'libxkbcommon'
 pkgname=libxkbcommon
 version=1.3.0
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname#lib}-${version}"
 build_style=meson
+# b_ndebug=false is needed to pass the test suite, as it relies on side effects
+# in the arguments of assert calls.
 configure_args="-Denable-x11=true -Denable-docs=false
- -Denable-wayland=true -Denable-xkbregistry=false"
+ -Denable-wayland=true -Denable-xkbregistry=true -Db_ndebug=false"
 hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols xorgproto"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols
+ xorgproto libxml2-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
@@ -27,8 +30,16 @@ libxkbcommon-x11_package() {
 	}
 }
 
+libxkbregistry_package() {
+	short_desc="XKB API to query available rules, models, layouts, variants and options"
+	pkg_install() {
+		vmove "usr/lib/libxkbregistry.so.*"
+	}
+}
+
 libxkbcommon-devel_package() {
 	depends="${sourcepkg}-x11>=${version}_${revision}
+	 libxkbregistry>=${version}_${revision}
 	 ${sourcepkg}>=${version}_${revision} libxcb-devel"
 	short_desc+=" - development files"
 	pkg_install() {
diff --git a/srcpkgs/libxkbregistry b/srcpkgs/libxkbregistry
new file mode 120000
index 000000000000..51911d5197ae
--- /dev/null
+++ b/srcpkgs/libxkbregistry
@@ -0,0 +1 @@
+libxkbcommon
\ No newline at end of file

From d3b5cd651f437865819728e68efdc0238f337d12 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 19 Aug 2021 11:50:19 +0200
Subject: [PATCH 697/904] Waybar: update to 0.9.8.

---
 .../patches/libfmt8-compatibility.patch       | 40 -------------------
 srcpkgs/Waybar/template                       |  6 +--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch

diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..ac01043daa5f 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.7
-revision=2
+version=0.9.8
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
@@ -31,7 +31,7 @@ changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
  https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
  https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
-checksum="0d23573e0f6ce6e3f3eb4d1d7313848b924429268f3becd81649a391ae7703e7
+checksum="3f067c484aaee3e7d8ded382e72c280a92913b0c4e8a20d0ac9afdf8baf19405
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

From c8ed4784251b595a2ac3f6bb59efb25617aa513a Mon Sep 17 00:00:00 2001
From: Dominic Monroe <dominic@dominic.io>
Date: Thu, 19 Aug 2021 09:12:32 +0100
Subject: [PATCH 698/904] clojure: update to 1.10.3.943.

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

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..268110c7367f 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
+version=1.10.3.943
 revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
@@ -9,12 +9,12 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=c370d1bd9b227b6daea0932b3504f1379856d292058c7e73030e59e3523533fb
 
 do_install() {
 	vmkdir /usr/lib/clojure
 	vmkdir /usr/lib/clojure/libexec
-	vcopy "deps.edn example-deps.edn" /usr/lib/clojure
+	vcopy "deps.edn example-deps.edn tools.edn" /usr/lib/clojure
 	vcopy exec.jar /usr/lib/clojure/libexec/
 	vcopy clojure-tools-${version}.jar /usr/lib/clojure/libexec/
 	sed -i -e 's@BINDIR@/usr/bin@g' clj

From aaeb8b68faddacef76bdec268f033ca41f11070c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 7 Aug 2021 20:20:33 +0200
Subject: [PATCH 699/904] mutter: update to 40.3.

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

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index fb42f099faaa..952bf115cdf3 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,9 +1,7 @@
 # Template file for 'mutter'
-reverts="40.2_1"
-
 pkgname=mutter
-version=40.1
-revision=2
+version=40.3
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -16,14 +14,17 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
  libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
  wayland-protocols gnome-settings-daemon-devel"
 depends="gsettings-desktop-schemas desktop-file-utils zenity"
+checkdepends="xvfb-run"
 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/"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a65f3272961133829687d4107267e4e19290e6d86e7807fad87eab0831c1e0c0
+checksum=5b15cf8f41da281424bb381ddcd0defc2e17b944b552f77df2fac5e2b34cb005
 shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
  libmutter-cogl-pango-8.so"
+make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -31,11 +32,6 @@ pre_build() {
 	ninja ${makejobs} -C build src/meta-dbus-display-config.h
 }
 
-# needs X
-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'

From da069eed481528036673baa43fac76d096a1324c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 Aug 2021 12:11:18 +0200
Subject: [PATCH 700/904] freerdp: build freerdp-server

---
 common/shlibs                |  3 +++
 srcpkgs/freerdp-server       |  1 +
 srcpkgs/freerdp-server-devel |  1 +
 srcpkgs/freerdp/template     | 49 +++++++++++++++++++++++++++++++++---
 srcpkgs/libfreerdp-server    |  1 +
 5 files changed, 51 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/freerdp-server
 create mode 120000 srcpkgs/freerdp-server-devel
 create mode 120000 srcpkgs/libfreerdp-server

diff --git a/common/shlibs b/common/shlibs
index 39136a41cfe3..b5363014957e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1581,6 +1581,9 @@ libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3
 libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3
 libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3
 libuwac0.so.0 libfreerdp-2.2.0_3
+libfreerdp-server2.so.2 libfreerdp-server-2.4.0_1
+libfreerdp-shadow-subsystem2.so.2 libfreerdp-server-2.4.0_1
+libfreerdp-shadow2.so.2 libfreerdp-server-2.4.0_1
 libcppunit-1.15.so.1 libcppunit-1.15.1_1
 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
diff --git a/srcpkgs/freerdp-server b/srcpkgs/freerdp-server
new file mode 120000
index 000000000000..ff5b2c64c02a
--- /dev/null
+++ b/srcpkgs/freerdp-server
@@ -0,0 +1 @@
+freerdp
\ No newline at end of file
diff --git a/srcpkgs/freerdp-server-devel b/srcpkgs/freerdp-server-devel
new file mode 120000
index 000000000000..ff5b2c64c02a
--- /dev/null
+++ b/srcpkgs/freerdp-server-devel
@@ -0,0 +1 @@
+freerdp
\ No newline at end of file
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..dd0ad5e3492e 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,32 +1,41 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.4.0
-revision=1
+revision=2
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
  -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
  -DWITH_LIBSYSTEMD=OFF -DWITH_PCSC=OFF -DWITH_PULSE=ON -DWITH_WAYLAND=ON
  -DWITH_XCURSOR=ON -DWITH_XEXT=ON -DWITH_XI=ON -DWITH_XINERAMA=ON
- -DWITH_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON
+ -DWITH_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON -DWITH_SERVER=ON
  -DWAYLAND_SCANNER=/usr/bin/wayland-scanner"
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
- libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
+ libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel
  libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
- libxkbcommon-devel wayland-devel cairo-devel"
+ libxkbcommon-devel wayland-devel cairo-devel libXdamage-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
 checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+CFLAGS="-Wno-dev"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
 	armv5tel*) configure_args+=" -DWITH_NEON=OFF";;
 esac
 
+post_install() {
+	rm -f ${DESTDIR}/usr/lib64
+}
+
+# first we want to separate -server, everything else then goes to client
+subpackages="libfreerdp-server freerdp-server freerdp-server-devel libfreerdp
+ freerdp-devel"
+
 libfreerdp_package() {
 	replaces="${sourcepkg}<1.0.2_2"
 	short_desc+=" - runtime libraries"
@@ -45,3 +54,35 @@ freerdp-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+libfreerdp-server_package() {
+	short_desc="Free RDP (Remote Desktop Protocol) server - runtime files"
+	depends="libfreerdp>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libfreerdp-server*.so.*"
+		vmove "usr/lib/libfreerdp-shadow*.so.*"
+	}
+}
+
+freerdp-server_package() {
+	short_desc="Free RDP (Remote Desktop Protocol) server"
+	depends="libfreerdp-server>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/freerdp-proxy
+		vmove usr/bin/freerdp-shadow-cli
+		vmove usr/share/man/man1/freerdp-shadow-cli.1
+	}
+}
+
+freerdp-server-devel_package() {
+	depends="libfreerdp-server>=${version}_${revision}"
+	short_desc="Free RDP (Remote Desktop Protocol) server - development files"
+	pkg_install() {
+		vmove usr/lib/cmake/FreeRDP-Server2
+		vmove usr/lib/cmake/FreeRDP-Shadow2
+		vmove usr/lib/pkgconfig/freerdp-server2.pc
+		vmove usr/lib/pkgconfig/freerdp-shadow2.pc
+		vmove "usr/lib/libfreerdp-server*.so"
+		vmove "usr/lib/libfreerdp-shadow*.so"
+	}
+}
diff --git a/srcpkgs/libfreerdp-server b/srcpkgs/libfreerdp-server
new file mode 120000
index 000000000000..ff5b2c64c02a
--- /dev/null
+++ b/srcpkgs/libfreerdp-server
@@ -0,0 +1 @@
+freerdp
\ No newline at end of file

From d21feb7396ac0fff7e4491fdafed032ca6b1c856 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 7 Aug 2021 17:41:55 +0200
Subject: [PATCH 701/904] New package: gnome-remote-desktop-40.1

---
 srcpkgs/gnome-remote-desktop/template | 37 +++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/gnome-remote-desktop/template

diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
new file mode 100644
index 000000000000..af0df3ee46ee
--- /dev/null
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -0,0 +1,37 @@
+# Template file for 'gnome-remote-desktop'
+pkgname=gnome-remote-desktop
+version=40.1
+revision=1
+build_style=meson
+configure_args="$(vopt_bool rdp rdp) $(vopt_bool vnc vnc)
+ -Dsystemd_user_unit_dir=/tmp"
+hostmakedepends="pkg-config glib-devel"
+makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
+ $(vopt_if rdp "freerdp-devel freerdp-server-devel fuse3-devel")
+ $(vopt_if vnc libvncserver-devel)"
+short_desc="GNOME remote desktop server"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/gnome-remote-desktop/"
+distfiles="https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/archive/$version/gnome-remote-desktop-$version.tar.gz"
+checksum=3c8466cd40405a6887171ada556a800e467d85bb52a506a33409c803b2d4f746
+make_check=no # xvfb failed to start
+
+build_options="rdp vnc"
+desc_option_rdp="RDP support"
+desc_option_vnc="VNC support"
+# RDP doesn't currently have GUI in gcs, so it's disabled by default
+build_options_default="vnc"
+
+pre_configure() {
+	if [ -z "$build_option_rdp" ] && [ -z "$build_option_vnc" ]; then
+		echo at least one of vnc and rdp options has to be enabled
+		exit 1
+	fi
+
+	vsed -e '/systemd_dep/d' -i meson.build
+}
+
+post_install() {
+	rm -rf ${DESTDIR}/tmp
+}

From 08b9dc2bd093b4fc22b1a113f1d9ce35e50bde53 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 Aug 2021 12:35:44 +0200
Subject: [PATCH 702/904] gnome: add gnome-remote-desktop

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 40d177182045..bd3cd44df890 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=40.0
-revision=1
+revision=2
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -25,6 +25,7 @@ depends="
  gnome-font-viewer>=40.0
  gnome-maps>=40.0
  gnome-music>=40.0
+ gnome-remote-desktop>=40.1
  gnome-screenshot>=40.0
  gnome-system-monitor>=40.0
  gnome-terminal>=3.40.0

From 78abd77276b6a0fd4507f54a2aa89511ea38aad5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 19 Aug 2021 23:39:08 +0200
Subject: [PATCH 703/904] evince: update to 40.4.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index f2ea649cfd7c..88bdf7449295 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=40.2
+version=40.4
 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/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ff7ec79376a8a97ac4cd274d32e804c7e236ef2d2d5d3f646de6eb882a63c77
+checksum=33420500e0e060f178a435063197d42dae7b67e39cc437a96510a33ddf7e95fb
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From d9ad41dbb2e63d91d89777abf805f0e3ab707bce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 19 Aug 2021 15:30:59 +0200
Subject: [PATCH 704/904] harfbuzz: update to 2.9.0.

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

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..28327bc32f2d 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.9.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
@@ -12,9 +12,9 @@ short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
-changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
+changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=3e1c2e1d2c65d56364fd16d1c41a06b2a35795496f78dfff635c2b7414b54c5a
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From bdd7ad660d3bb4446e0b941685dbfc92316d44e8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 19 Aug 2021 15:38:18 +0200
Subject: [PATCH 705/904] squashfs-tools-ng: update to 1.1.3.

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

diff --git a/srcpkgs/squashfs-tools-ng/template b/srcpkgs/squashfs-tools-ng/template
index f2e6171f0242..3a6e48497035 100644
--- a/srcpkgs/squashfs-tools-ng/template
+++ b/srcpkgs/squashfs-tools-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'squashfs-tools-ng'
 pkgname=squashfs-tools-ng
-version=1.1.2
+version=1.1.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://infraroot.at/projects/squashfs-tools-ng/index.html"
 changelog="https://git.infraroot.at/squashfs-tools-ng.git/plain/CHANGELOG.md"
 distfiles="https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"
-checksum=4afe24fa7ebf583e00f7eef23259a286a4f1eaa780d610e2678cd58e7c5c9942
+checksum=abce0fcf9a8ae1c3352e4e5e87e1b077f54411da517332ea83b5e7ce948dd70d
 
 squashfs-tools-ng-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 75963c3680e831601213d3eafecdce61a814cd76 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 19 Aug 2021 15:38:22 +0200
Subject: [PATCH 706/904] plocate: update to 1.1.9.

---
 srcpkgs/plocate/patches/include.patch | 10 ++++++++++
 srcpkgs/plocate/template              |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/plocate/patches/include.patch

diff --git a/srcpkgs/plocate/patches/include.patch b/srcpkgs/plocate/patches/include.patch
new file mode 100644
index 000000000000..2ba06abf287d
--- /dev/null
+++ b/srcpkgs/plocate/patches/include.patch
@@ -0,0 +1,10 @@
+--- a/plocate.cpp.orig
++++ b/plocate.cpp
+@@ -31,6 +31,7 @@
+ #include <string.h>
+ #include <string>
+ #include <string_view>
++#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <thread>
diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 58252651243d..9fe873cba5a6 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,9 +1,10 @@
 # Template file for 'plocate'
 pkgname=plocate
-version=1.1.8
+version=1.1.9
 revision=1
 build_style=meson
 configure_args="
+ -Dinstall_systemd=false
  -Dupdatedb_progname=pupdatedb
  -Dlocategroup=_plocate"
 hostmakedepends="pkg-config"
@@ -14,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://plocate.sesse.net/"
 changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=13002f065c28a93623a03d44c911a44f1659e8b1841aad80fd8a566a1200f43c
+checksum=0df2bee9921ca74dd2587222d1d9a3b61d561252c9316d3667d2bd0b697798c8
 
 system_accounts="_plocate"
 

From d766d56c7e46814df81cd9d467cb538fdcffea12 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Aug 2021 14:22:57 +0200
Subject: [PATCH 707/904] knot-resolver: update to 5.4.1.

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

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..a113d52ce4ae 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,7 +1,7 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.4.1
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
@@ -19,7 +19,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=fb8b962dd9ef744e2551c4f052454bc2a30e39c1f662f4f3522e8f221d8e3d66
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From d7b3336d5f836b004bd5053229761cdc28f046d4 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Thu, 19 Aug 2021 06:07:24 +0000
Subject: [PATCH 708/904] alsa-utils: update to 1.2.5.1

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

diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 562a6896aa7e..7cefc15ef2b1 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'alsa-utils'
 pkgname=alsa-utils
-version=1.2.4
+version=1.2.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf
@@ -14,7 +14,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/utils/${pkgname}-${version}.tar.bz2"
-checksum=98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426
+checksum=9c169ae37a49295f9b97b92ace772803daf6b6510a19574e0b78f87e562118d0
 
 post_install() {
 	# Install required udev rules file.

From d5838b98cd1eb88d1e0b05c52f24d4d1a066e530 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Thu, 19 Aug 2021 06:20:02 +0000
Subject: [PATCH 709/904] alsa-tools:update to 1.2.5

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

diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 1078472c79ae..40aa8080d8cd 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'alsa-tools'
 pkgname=alsa-tools
-version=1.2.2
-revision=2
+version=1.2.5
+revision=1
 hostmakedepends="pkg-config"
 makedepends="fltk-devel gtk+-devel gtk+3-devel"
 depends="python3-gobject python3-alsa"
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
-checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
+checksum=35a71027a01f4d7de4722e223520e940de68b3c570b6c671691567ae28f9893e
 python_version=3
 
 _tools="

From 2778b4f92d55b3e1f2869ccc0d0a628a67635b5c Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Thu, 19 Aug 2021 06:42:03 +0000
Subject: [PATCH 710/904] alsa-plugins: update to 1.2.5

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

diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 717603d7d606..731664697790 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'alsa-plugins'
 pkgname=alsa-plugins
-version=1.2.2
+version=1.2.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-maemo-plugin"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/plugins/${pkgname}-${version}.tar.bz2"
-checksum=1c0f06450c928d711719686c9dbece2d480184f36fab11b8f0534cb7b41e337d
+checksum=42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20
 
 post_install() {
 	rm -rfv ${DESTDIR}/etc/alsa/conf.d

From 7df23ed29c7bb8f799bbf9763c07bc9095eb9b4d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 20 Aug 2021 20:52:14 +0200
Subject: [PATCH 711/904] hledger: update to 1.22.2

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

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index 1727a49252b7..3b2ba72781cf 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,16 +1,16 @@
 # Template file for 'hledger'
 pkgname=hledger
-version=1.21
-revision=2
+version=1.22.2
+revision=1
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="GPL-3.0-or-later"
-homepage="http://hledger.org/"
+homepage="https://hledger.org/"
 changelog="https://hackage.haskell.org/package/hledger-${version}/changelog"
 distfiles="https://github.com/simonmichael/${pkgname}/archive/${version}.tar.gz"
-checksum=55a83947852ff088b244447ae0d0d96b8902d867b9b0773ebd1dab2e64e98ecd
+checksum=83b9267a84d4e9f63ffed982a4bbe507c7be94789bb75141fadf5891389b8d1a
 nopie_files="/usr/bin/hledger"
 nocross=yes # Can't yet cross compile Haskell
 

From 086f3790faebfc70a1357cb8868486dba013dc4b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 21 Aug 2021 02:15:07 +0200
Subject: [PATCH 712/904] pipewire: fix build on big endian

---
 srcpkgs/pipewire/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index fcd2617e2cad..679d012f1d97 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -42,6 +42,8 @@ fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	makedepends+=" ldacBT-devel"
+else
+	configure_args+=" -Dbluez5-codec-ldac=disabled"
 fi
 
 post_install() {

From ca6c935a23d5634bb9104c9911196c0507323601 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 2 Aug 2021 10:46:53 +0700
Subject: [PATCH 713/904] New package: ttf-opensans-3.000_1

---
 srcpkgs/ttf-opensans/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/ttf-opensans/template

diff --git a/srcpkgs/ttf-opensans/template b/srcpkgs/ttf-opensans/template
new file mode 100644
index 000000000000..b42ce1f43d6f
--- /dev/null
+++ b/srcpkgs/ttf-opensans/template
@@ -0,0 +1,19 @@
+# Template file for 'ttf-opensans'
+pkgname=ttf-opensans
+version=3.000
+revision=1
+_githash=c071e9696751f2d69925d66f3b8c581f2dc041c2
+wrksrc="opensans-${_githash}"
+depends="font-util"
+short_desc="Clean and modern sans-serif typeface"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
+license="Apache-2.0"
+homepage="https://fonts.google.com/specimen/Open+Sans"
+distfiles="https://github.com/googlefonts/opensans/archive/${_githash}.tar.gz"
+checksum=fcbeae8c630a9afe2b6722c86a77788e549c353bea8cf7fbbc2e3f2fdacabcb7
+font_dirs="/usr/share/fonts/TTF"
+
+do_install() {
+	vmkdir usr/share/fonts/TTF
+	find fonts/ttf/ -type f -name '*.ttf' -exec install -Dm644 '{}' ${DESTDIR}/usr/share/fonts/TTF \;
+}

From 139a3fc3f3bb054be555f3d937c399c6e5f2ff1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Aug 2021 23:53:26 +0200
Subject: [PATCH 714/904] telegram-desktop: update to 2.9.3.

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

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..57bee005ddd2 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.9.3
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -20,14 +20,14 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
  xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel)
  kwayland-devel glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel"
-depends="qt5-imageformats qt5-core>=5.15.2<5.16.0"
+depends="qt5-imageformats qt5-core>=5.15.2<5.16.0 ttf-opensans"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=8f661157030e776f42f8a2a3a5e1434f22ded78cc6a5d4bce67004d6d79c1a14
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From af336e02f024580cae7276e55421365b03172064 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Sat, 21 Aug 2021 14:40:58 +0200
Subject: [PATCH 715/904] pipewire: add fix for usb devices from master

https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1478
---
 .../patches/fix-hotplug-usb-devices.patch     | 31 +++++++++++++++++++
 srcpkgs/pipewire/template                     |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/pipewire/patches/fix-hotplug-usb-devices.patch

diff --git a/srcpkgs/pipewire/patches/fix-hotplug-usb-devices.patch b/srcpkgs/pipewire/patches/fix-hotplug-usb-devices.patch
new file mode 100644
index 000000000000..82c7c38cbc16
--- /dev/null
+++ b/srcpkgs/pipewire/patches/fix-hotplug-usb-devices.patch
@@ -0,0 +1,31 @@
+From 0a5a4c046d10c0a53c7d2120a523cc28663ad73b Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 10 Aug 2021 11:23:48 +0200
+Subject: [PATCH] alsa: Free global state
+
+We need to do this or else newly plugged devices might not load.
+
+It does not seem to harm UCM config on my machine, so this reverts
+3d372424ccb96fd2b705c9ed94e76a82ad44e113
+
+See #1478
+---
+ spa/plugins/alsa/alsa-pcm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/spa/plugins/alsa/alsa-pcm.c b/spa/plugins/alsa/alsa-pcm.c
+index 30fbbba6e..299bf03ff 100644
+--- a/spa/plugins/alsa/alsa-pcm.c
++++ b/spa/plugins/alsa/alsa-pcm.c
+@@ -20,6 +20,8 @@ int spa_alsa_init(struct state *state)
+ {
+ 	int err;
+ 
++	snd_config_update_free_global();
++
+ 	if (state->open_ucm) {
+ 		char card_name[64];
+ 		const char *alibpref = NULL;
+-- 
+GitLab
+
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 679d012f1d97..d82f8f9b4062 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.33
-revision=1
+revision=2
 build_style=meson
 configure_args="
  --auto-features=enabled

From e499b56149bf577e8349b04b3f58403d4ff25d26 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sat, 21 Aug 2021 14:12:40 +0700
Subject: [PATCH 716/904] vivaldi: update to 4.1.2369.21

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 377b0f008dbb..932defdf676d 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=4.0.2312.41
+version=4.1.2369.21
 revision=1
 _release=1
 archs="x86_64"
@@ -18,7 +18,7 @@ nostrip=yes
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=70f552d36b520cbfe747b24902a968ad03c359ffa49882869a60f03ca6c131bc
+checksum=14650cf07f5ffc2402562dc8da5d965298f3b404827c9982b8585d336315060c
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/vivaldi-stable_${version}-${_release}_amd64.deb

From 4df49668d10d4e63e2db86cb2acc44f87554ea72 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Aug 2021 16:01:08 +0200
Subject: [PATCH 717/904] nftables: update to 1.0.0.

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

diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template
index 08dd1308d58b..17a835cac752 100644
--- a/srcpkgs/nftables/template
+++ b/srcpkgs/nftables/template
@@ -1,6 +1,6 @@
 # Template file for 'nftables'
 pkgname=nftables
-version=0.9.9
+version=1.0.0
 revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://netfilter.org/projects/nftables/"
 distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=76ef2dc7fd0d79031a8369487739a217ca83996b3a746cec5bda79da11e3f1b4
+checksum=58bf547daf967a2b88ecb4f425f126006ebde22711db806b25c1d6cf84fe45f4
 
 post_install() {
 	vsv nftables

From 8fb50c7ab0b30a68dc0c347741aff40496eea091 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Aug 2021 16:02:01 +0200
Subject: [PATCH 718/904] perl-Keyword-Declare: update to 0.001018.

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

diff --git a/srcpkgs/perl-Keyword-Declare/template b/srcpkgs/perl-Keyword-Declare/template
index ab08489f5d54..2dc845347cd9 100644
--- a/srcpkgs/perl-Keyword-Declare/template
+++ b/srcpkgs/perl-Keyword-Declare/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Keyword-Declare'
 pkgname=perl-Keyword-Declare
-version=0.001017
-revision=2
+version=0.001018
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-B-Hooks-EndOfScope perl-Keyword-Simple perl-PPR"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Keyword-Declare"
 distfiles="${CPAN_SITE}/Sub/DCONWAY/Keyword-Declare-${version}.tar.gz"
-checksum=6cc1cd21f34c869d1fdc95cfd35b36754105a90123430d43f91e04288e2ee315
+checksum=f427a661ffba120330455e2b4457d98909356723cbd76aca2833faa387981754

From 39dd3371a4564f6386abdb8153fcc6b8a3c45cce Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Aug 2021 16:04:22 +0200
Subject: [PATCH 719/904] perl-LWP: update to 6.56.

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

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index a39d41d369ac..10ec177de38a 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.55
+version=6.56
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=c1d0d3a44a039b136ebac7336f576e3f5c232347e8221abd69ceb4108e85c920
+checksum=94362e68e5c6782f3987a9dec6adc409d20e28665dbf28ff47d1d701443ce7ce

From 618a659c4e974b9eb0de1efa784ecfba7f9d4158 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Aug 2021 16:12:26 +0200
Subject: [PATCH 720/904] linux5.10: update to 5.10.60.

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

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..b7931f1ae3dc 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.60
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=696ff7753f6c7c5123dbcb0a22d693cb358c760c61a76649531b6a207155f78d
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 802a30d8874b55082b7d1d58bf856cc8618bbad4 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Tue, 17 Aug 2021 05:47:29 +0100
Subject: [PATCH 721/904] go: update to 1.17.

Closes: #32524 [via git-merge-pr]
---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..2334351b98ff 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.17
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d
 nostrip=yes
 noverifyrdeps=yes
 

From 7acde8911f288c26abe5904330a24c67d2a40468 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 22 Aug 2021 08:23:18 +0200
Subject: [PATCH 722/904] linux5.4: update to 5.4.142.

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

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..62eda559b346 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.142
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=99785728968564ba27c7e552d024b560072dcbc885540912eabb5c021e231451
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4ddade5db507d8889f266f33ac9a40a6e1890015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 15:57:41 +0700
Subject: [PATCH 723/904] gnome-remote-desktop: switch distfiles to GNOME_SITE

Static distfile is less stress for server.
Also, better for update-check.
---
 srcpkgs/gnome-remote-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index af0df3ee46ee..ade928ed6a18 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -12,9 +12,9 @@ makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
 short_desc="GNOME remote desktop server"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/gnome-remote-desktop/"
-distfiles="https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/archive/$version/gnome-remote-desktop-$version.tar.gz"
-checksum=3c8466cd40405a6887171ada556a800e467d85bb52a506a33409c803b2d4f746
+homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
+distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
+checksum=9afa6e525570a372093f9730338270903894f3b1f9f8a9df5f57836ea1d29de9
 make_check=no # xvfb failed to start
 
 build_options="rdp vnc"

From a80b25d3d1dee6d793cac870803dd64bf8fb4dd8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:42:17 -0700
Subject: [PATCH 724/904] x2vnc: fix license, template layout

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

diff --git a/srcpkgs/x2vnc/template b/srcpkgs/x2vnc/template
index 54485d5905eb..b810f5c5ae9f 100644
--- a/srcpkgs/x2vnc/template
+++ b/srcpkgs/x2vnc/template
@@ -1,14 +1,14 @@
 # Template file for 'x2vnc'
 pkgname=x2vnc
 version=1.7.2
-revision=1
+revision=2
 hostmakedepends="imake"
 makedepends="libXrandr-devel libXxf86dga-devel libX11-devel libXScrnSaver-devel"
 depends="libXrandr libXxf86dga libX11 libXScrnSaver"
 short_desc="Connect mouse via VNC"
 maintainer="teldra <teldra@rotce.de>"
+license="GPL-2.0-or-later"
 homepage="http://fredrik.hubbe.net/x2vnc.html"
-license="GPL-2"
 distfiles="http://fredrik.hubbe.net/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=dc076dc0dad1ae4ebf5bc95bf792812b2639e92e127efb9c68de6a53874c7001
 

From 1b5fcbd646d4c587a9b2166d13dcf583bdcc462a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:47:06 -0700
Subject: [PATCH 725/904] x48: fix license, vsed

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

diff --git a/srcpkgs/x48/template b/srcpkgs/x48/template
index a8915322c01b..9272ba0d9c3f 100644
--- a/srcpkgs/x48/template
+++ b/srcpkgs/x48/template
@@ -1,14 +1,14 @@
 # Template file for 'x48'
 pkgname=x48
 version=0.6.4
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="libXt-devel libXext-devel"
 short_desc="HP48 CPU Emulator"
 maintainer="allan <mail@may.mooo.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/x48.berlios/"
 distfiles="${SOURCEFORGE_SITE}/x48.berlios/files/$pkgname-$version.tar.bz2"
 checksum=dd42fb3dfde860abb758f8e6d5ccd01845bbf0dcd808b87786eec3ef7091067f
@@ -18,9 +18,9 @@ pre_configure() {
 }
 
 pre_build() {
-	sed -i '698s/inline/static inline/' src/emulate.c
+	vsed -i '698s/inline/static inline/' src/emulate.c
 }
 
 pre_install() {
-	sed -i 's:helvetica:fixed:' X48
+	vsed -i 's:helvetica:fixed:' X48
 }

From d913e6f65eb9a7401a521bfe02bd62dd2ec1a71c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:51:39 -0700
Subject: [PATCH 726/904] xautolock: fix license

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

diff --git a/srcpkgs/xautolock/template b/srcpkgs/xautolock/template
index 673e57c9a787..77cea8f39374 100644
--- a/srcpkgs/xautolock/template
+++ b/srcpkgs/xautolock/template
@@ -1,12 +1,12 @@
 # Template file for 'xautolock'
 pkgname=xautolock
 version=2.2
-revision=6
+revision=7
 hostmakedepends="imake xorg-cf-files"
 makedepends="libXScrnSaver-devel xorgproto"
 short_desc="Autolock utility for X"
 maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
 distfiles="${homepage}/${pkgname}-${version}.tgz"
 checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2

From b01994e0c066746a505e535afb4a8d21b3ead0ec Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:45:31 -0700
Subject: [PATCH 727/904] xbattmon: fix license

---
 srcpkgs/xbattmon/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbattmon/template b/srcpkgs/xbattmon/template
index d3f92968b1b6..848444e3da79 100644
--- a/srcpkgs/xbattmon/template
+++ b/srcpkgs/xbattmon/template
@@ -1,13 +1,13 @@
 # Template file for 'xbattmon'
 pkgname=xbattmon
 version=1.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="PREFIX=/usr"
 makedepends="libX11-devel"
 short_desc="Simple battery monitor"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-3"
+license="ISC"
 homepage="http://git.2f30.org/xbattmon/"
 distfiles="http://dl.2f30.org/releases/${pkgname}-${version}.tar.gz"
 checksum=4ff7b156c69a56e4e6649a9f3bf5ee72858f856e7aad3614e8b3275a29f226ff
@@ -16,3 +16,7 @@ pre_build() {
 	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
 	sed -i '/^PREFIX =*/d' config.mk
 }
+
+post_install() {
+	vlicense LICENSE
+}

From ce7a92144dbb3f36741cf954b745c42f22b18e78 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:48:57 -0700
Subject: [PATCH 728/904] xcalib: fix license, homepage, vsed

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

diff --git a/srcpkgs/xcalib/template b/srcpkgs/xcalib/template
index ddbe46399064..7315107e7e43 100644
--- a/srcpkgs/xcalib/template
+++ b/srcpkgs/xcalib/template
@@ -1,18 +1,18 @@
 # Template file for 'xcalib'
 pkgname=xcalib
 version=0.8
-revision=4
+revision=5
 build_style="gnu-makefile"
 makedepends="libX11-devel libXxf86vm-devel"
 short_desc="Tiny monitor calibration loader for X.org"
 maintainer="Steven R <dev@styez.com>"
-license="GPL-2"
-homepage="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/"
+license="GPL-2.0-or-later"
+homepage="http://xcalib.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/xcalib/xcalib-source-${version}.tar.gz"
 checksum="8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6"
 
 post_extract() {
-	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile
+	vsed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile
 }
 do_install() {
 	vbin xcalib

From a36bc359e497e36c3e5a36f6be4aaf2fe1c9d851 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:54:07 -0700
Subject: [PATCH 729/904] xcape: fix license

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

diff --git a/srcpkgs/xcape/template b/srcpkgs/xcape/template
index 3bf3372fdd49..0c84278738fa 100644
--- a/srcpkgs/xcape/template
+++ b/srcpkgs/xcape/template
@@ -1,12 +1,12 @@
 # Template file for 'xcape'
 pkgname=xcape
 version=1.2
-revision=1
+revision=2
 hostmakedepends="pkg-config"
 makedepends="libXtst-devel libXi-devel"
 short_desc="Allows you to use a single press of a modifier key as another key"
 maintainer="Matt Carroll <oholiab@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/alols/xcape"
 distfiles="https://github.com/alols/xcape/archive/v${version}.tar.gz"
 checksum=a27ed884fd94f03058af65a39edfe3af3f2f8fbb76ba9920002a76be07fb2821

From 4ad0e1734599ed3fe7369d65c5ad5749fa83ace0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:14:47 -0700
Subject: [PATCH 730/904] xcb-util: fix license, http->https

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

diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index 86d4d0b585b9..26da06907d2f 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -1,18 +1,22 @@
 # Template file for 'xcb-util'
 pkgname=xcb-util
 version=0.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config gperf"
 makedepends="libxcb-devel"
 short_desc="XCB utilities library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+license="X11"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
 checksum=46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9
 
+post_install() {
+	vlicense COPYING LICENSE
+}
+
 xcb-util-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 1096015b2378185290df46e6263e59a7236d78d0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:51:36 -0700
Subject: [PATCH 731/904] xcb-util-image: fix license, description, http->https

---
 srcpkgs/xcb-util-image/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xcb-util-image/template b/srcpkgs/xcb-util-image/template
index dbd6e284204a..007dac1fd7de 100644
--- a/srcpkgs/xcb-util-image/template
+++ b/srcpkgs/xcb-util-image/template
@@ -1,18 +1,22 @@
 # Template file for 'xcb-util-image'
 pkgname=xcb-util-image
 version=0.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions"
+short_desc="Utility libraries for XCB - XImage and XShmImage functions"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-image-${version}.tar.bz2"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-image-${version}.tar.bz2"
 checksum=2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc
 
+post_install() {
+	vlicense COPYING LICENSE
+}
+
 xcb-util-image-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From cdf190eff9a90cbaa40584d9a1ecafc641615d79 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:52:19 -0700
Subject: [PATCH 732/904] xcb-util-keysyms: fix license, description,
 http->https

---
 srcpkgs/xcb-util-keysyms/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xcb-util-keysyms/template b/srcpkgs/xcb-util-keysyms/template
index 7c932ded1944..185b6f09868c 100644
--- a/srcpkgs/xcb-util-keysyms/template
+++ b/srcpkgs/xcb-util-keysyms/template
@@ -1,18 +1,23 @@
 # Template file for 'xcb-util-keysyms'
 pkgname=xcb-util-keysyms
 version=0.4.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes"
+short_desc="Utility libraries for XCB - key constants and keycode conversion"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-keysyms-${version}.tar.bz2"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-keysyms-${version}.tar.bz2"
 checksum=0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9
 
+post_install() {
+	head -n30 keysyms/keysyms.c > LICENSE
+	vlicense LICENSE
+}
+
 xcb-util-keysyms-devel_package() {
 	depends="libxcb-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 50e7eef9676a28b211a1a87d89588a2ccca2d7c3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:52:49 -0700
Subject: [PATCH 733/904] xcb-util-renderutil: fix license, description,
 http->https

---
 srcpkgs/xcb-util-renderutil/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xcb-util-renderutil/template b/srcpkgs/xcb-util-renderutil/template
index 512b29b8e180..abe2903c5776 100644
--- a/srcpkgs/xcb-util-renderutil/template
+++ b/srcpkgs/xcb-util-renderutil/template
@@ -1,18 +1,22 @@
 # Template file for 'xcb-util-renderutil'
 pkgname=xcb-util-renderutil
 version=0.3.9
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Convenience functions for the Render extension"
+short_desc="Utility libraries for XCB - Render extension convenience functions"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-renderutil-${version}.tar.bz2"
+license="X11, MIT"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-renderutil-${version}.tar.bz2"
 checksum=c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b
 
+post_install() {
+	vlicense COPYING LICENSE
+}
+
 xcb-util-renderutil-devel_package() {
 	depends="libxcb-devel ${sourcepkg}>=${version}"
 	short_desc+=" - development files"

From 246f599661cc81d98ed681fad41abf21a5f6fc63 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:09 -0700
Subject: [PATCH 734/904] xdaliclock: fix license

---
 srcpkgs/xdaliclock/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdaliclock/template b/srcpkgs/xdaliclock/template
index 5fb668427d18..4c397c59eb42 100644
--- a/srcpkgs/xdaliclock/template
+++ b/srcpkgs/xdaliclock/template
@@ -1,7 +1,7 @@
 # Template file for 'xdaliclock'
 pkgname=xdaliclock
 version=2.44
-revision=1
+revision=2
 build_wrksrc=X11
 build_style=gnu-configure
 makedepends="libXext-devel libXt-devel"
@@ -12,6 +12,10 @@ homepage="http://www.jwz.org/xdaliclock/"
 distfiles="http://www.jwz.org/xdaliclock/xdaliclock-${version}.tar.gz"
 checksum=800db9ad00adaeb73079370fb64452230ff186e670b6fbd36315506caab64fbf
 
+post_install() {
+	vlicense LICENSE
+}
+
 pre_configure() {
 	sed -i -e '/a trivial ANSI C/,+10s/ { (exit 1); exit 1; };//' \
 		-e '/INCLUDES=/s/.*/:/' \

From 0facebb5cbd074e934652a3b137619bb79b83838 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:26 -0700
Subject: [PATCH 735/904] xdu: fix license

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

diff --git a/srcpkgs/xdu/template b/srcpkgs/xdu/template
index d7d31bf5d79c..7a3f447d340b 100644
--- a/srcpkgs/xdu/template
+++ b/srcpkgs/xdu/template
@@ -1,12 +1,12 @@
 # Template file for 'xdu'
 pkgname=xdu
 version=3.1
-revision=2
+revision=3
 build_style=gnu-makefile
 makedepends="libXaw-devel"
 short_desc="Display the output of du(1) in an X window"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT/X11"
+license="MIT, X11"
 homepage="https://github.com/leahneukirchen/xdu"
 distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
 checksum=13035b0642b1042debf6c84d0963b3fd3914f76c8dfb9c8c6f852ee1451eea1f

From 02b882318462673b8b978303b108a29e339d372b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:52 -0700
Subject: [PATCH 736/904] xorg-cf-files: fix license, homepage

---
 srcpkgs/xorg-cf-files/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template
index aea5c85748e2..b7b8a7c1dac2 100644
--- a/srcpkgs/xorg-cf-files/template
+++ b/srcpkgs/xorg-cf-files/template
@@ -1,16 +1,20 @@
 # Template file for 'xorg-cf-files'
 pkgname=xorg-cf-files
 version=1.0.6
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake xorg-util-macros font-util"
 short_desc="X.Org imake program and related utilities"
 maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="X11"
-homepage="http://xorg.freedesktop.org/"
+homepage="https://www.x.org/wiki/"
 distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
 checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d
 
 pre_configure() {
 	autoreconf -fi
 }
+
+post_install() {
+	vlicense COPYING
+}

From af084f26402dc6c1f41ae17efe109e1e05e2656c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:01:10 -0700
Subject: [PATCH 737/904] xcb-util-wm: fix license, description, http->https,
 template layout

---
 srcpkgs/xcb-util-wm/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xcb-util-wm/template b/srcpkgs/xcb-util-wm/template
index 2a5ebf64d0c0..3a804063244b 100644
--- a/srcpkgs/xcb-util-wm/template
+++ b/srcpkgs/xcb-util-wm/template
@@ -1,17 +1,20 @@
-# Template build for 'xcb-util-wm'.
+# Template file for 'xcb-util-wm'
 pkgname=xcb-util-wm
 version=0.4.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="m4 pkg-config"
 makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
+short_desc="Utility libraries for XC Binding - window-manager helpers for ICCCM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://xcb.freedesktop.org"
-license="GPL-2"
-distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+license="X11"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
 checksum=28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f
 
+post_install() {
+	vlicense COPYING LICENSE
+}
 xcb-util-wm-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From f01bc807be8cdb9c0b63d38a1b197ec88ea82052 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:06:29 -0700
Subject: [PATCH 738/904] xclip: fix license, template layout

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

diff --git a/srcpkgs/xclip/template b/srcpkgs/xclip/template
index b307cbca33f3..399b445370a2 100644
--- a/srcpkgs/xclip/template
+++ b/srcpkgs/xclip/template
@@ -1,14 +1,14 @@
 # Template file for 'xclip'
 pkgname=xclip
 version=0.13
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake"
 makedepends="libXmu-devel"
+short_desc="Command line interface to the X11 clipboard"
 maintainer="Steven R <dev@styez.com>"
+license="GPL-2.0-or-later"
 homepage="https://github.com/astrand/xclip"
-license="GPL-2"
-short_desc="Command line interface to the X11 clipboard"
 distfiles="https://github.com/astrand/xclip/archive/${version}.tar.gz"
 checksum=ca5b8804e3c910a66423a882d79bf3c9450b875ac8528791fb60ec9de667f758
 

From 42e1892f6299088de245584a7288d78c86de2a0a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:29:39 -0700
Subject: [PATCH 739/904] xcompmgr: fix license, homepage

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

diff --git a/srcpkgs/xcompmgr/template b/srcpkgs/xcompmgr/template
index dd5eed8438cd..14d486fa14eb 100644
--- a/srcpkgs/xcompmgr/template
+++ b/srcpkgs/xcompmgr/template
@@ -1,14 +1,14 @@
 # Template file for 'xcompmgr'
 pkgname=xcompmgr
 version=1.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXcomposite-devel libXdamage-devel libXrender-devel libXext-devel"
 short_desc="Composite Window-effects manager for X.org"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="custom"
-homepage="http://xorg.freedesktop.org"
+license="HPND"
+homepage="https://www.x.org/wiki/"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
 checksum=0b89daf4f060fa3fa83cca862c45d531fef7121b5d06552c1d73d396ad9a7243
 

From c03a4b39884263a7d6d6646abae6b6c5a3330910 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:51:35 -0700
Subject: [PATCH 740/904] xdo: fix license, vsed

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

diff --git a/srcpkgs/xdo/template b/srcpkgs/xdo/template
index 38ad79065d86..8f63746ea125 100644
--- a/srcpkgs/xdo/template
+++ b/srcpkgs/xdo/template
@@ -1,18 +1,18 @@
 # Template file for 'xdo'
 pkgname=xdo
 version=0.5.7
-revision=2
+revision=3
 build_style=gnu-makefile
 makedepends="libxcb-devel xcb-util-wm-devel"
 short_desc="Small X utility to perform elementary actions on windows"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://github.com/baskerville/xdo"
 distfiles="https://github.com/baskerville/${pkgname}/archive/${version}.tar.gz"
 checksum=b661229f0457939d3867cca1664c5671ae959b309feb58abe9142229c8c7ffb4
 
 post_extract() {
-	sed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
+	vsed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
 }
 
 post_install() {

From 34bf0d40876a5b8987b4208ef3769125dd223016 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 13:13:31 -0700
Subject: [PATCH 741/904] xfig: fix license, description, vsed

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

diff --git a/srcpkgs/xfig/template b/srcpkgs/xfig/template
index 4c316f35b32d..1ae7e04a4363 100644
--- a/srcpkgs/xfig/template
+++ b/srcpkgs/xfig/template
@@ -1,21 +1,21 @@
 # Template file for 'xfig'
 pkgname=xfig
 version=3.2.8a
-revision=1
+revision=2
 build_style="gnu-configure"
 hostmakedepends="fig2dev ghostscript netpbm"
 makedepends="libXaw-devel libXaw3d-devel libXi-devel libXmu-devel libXpm-devel
  libXt-devel libjpeg-turbo-devel libpng-devel"
 depends="gsfonts fig2dev"
-short_desc="An interactive drawing tool"
+short_desc="Interactive drawing tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT-like"
+license="custom:xfig"
 homepage="http://mcj.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz"
 checksum=ba43c0ea85b230d3efa5a951a3239e206d0b033d044c590a56208f875f888578
 
 post_extract() {
-	sed -i 's/spell/aspell/' app-defaults/Fig.in
+	vsed -i 's/spell/aspell/' app-defaults/Fig.in
 }
 
 post_install() {

From c3015a064082d9d6aa575157b7c89f83178ca438 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 21:20:47 -0700
Subject: [PATCH 742/904] xgalaga++: fix license, description, vsed

The version of the GPL is entirely a guess. The package itself says:
"This software is released under the GNU General Public License."

So I'm assuming that it's bound by whatever the latest GPL is.
---
 srcpkgs/xgalaga++/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xgalaga++/template b/srcpkgs/xgalaga++/template
index 811098be45a5..0f426f0f70e2 100644
--- a/srcpkgs/xgalaga++/template
+++ b/srcpkgs/xgalaga++/template
@@ -1,23 +1,23 @@
 # Template file for 'xgalaga++'
 pkgname=xgalaga++
 version=0.9
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_target="all"
 _high_scores_dir="/var/games/xgalaga++"
 make_dirs="$_high_scores_dir 0775 root users"
 makedepends="libX11-devel libXpm-devel"
-short_desc="A classic single screen vertical shoot ’em up"
+short_desc="Classic single screen vertical shoot ’em up"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://marc.mongenet.ch/OSS/XGalaga/"
 distfiles="http://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${version}.tar.gz"
 checksum=c8db4bb9808c1cbbd001533b08318f6ab76b877ab6ed313d977d6a8546cc7fc9
 
 post_extract() {
-	sed -i -e 's|$(installprefix)/games|$(installprefix)/bin|' \
-	       -e 's|EXE_GROUP=games|EXE_GROUP=users|' \
-	       -e "s|HIGH_SCORES_FILE=.*|HIGH_SCORES_FILE=$_high_scores_dir/scores|" Makefile
+	vsed -i -e 's|$(installprefix)/games|$(installprefix)/bin|' \
+	        -e 's|EXE_GROUP=games|EXE_GROUP=users|' \
+	        -e "s|HIGH_SCORES_FILE=.*|HIGH_SCORES_FILE=$_high_scores_dir/scores|" Makefile
 }
 
 do_install() {

From f871e7f47dedff59321227fc7b0d095b87520c18 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 22:09:51 -0700
Subject: [PATCH 743/904] xmp: fix license, layout

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

diff --git a/srcpkgs/xmp/template b/srcpkgs/xmp/template
index bdf701b3c59b..918df2068cb7 100644
--- a/srcpkgs/xmp/template
+++ b/srcpkgs/xmp/template
@@ -2,14 +2,13 @@
 pkgname=xmp
 version=4.1.0
 revision=1
-short_desc="Extended module player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-homepage="http://xmp.sourceforge.net"
-license="GPL-2"
+build_style=gnu-configure
 conf_files="/etc/xmp/xmp.conf /etc/xmp/modules.conf"
 hostmakedepends="pkg-config"
 makedepends="libxmp-devel alsa-lib-devel pulseaudio-devel"
-build_style=gnu-configure
+short_desc="Extended module player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-only"
+homepage="http://xmp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
 checksum=1dbd61074783545ac7bef5b5daa772fd2110764cb70f937af8c3fad30f73289e
-

From c684ec26f40d1e0cec4b8c735c8ff40457137bf0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:33:59 -0700
Subject: [PATCH 744/904] xnp2: fix license, description

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

diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
index 1070cad41c20..7ae496fc224e 100644
--- a/srcpkgs/xnp2/template
+++ b/srcpkgs/xnp2/template
@@ -1,15 +1,15 @@
 # Template file for 'xnp2'
 pkgname=xnp2
 version=0.86
-revision=1
+revision=2
 build_wrksrc=x11
 build_style=gnu-configure
 configure_args="--enable-ia32 --enable-build-all"
 hostmakedepends="pkg-config nasm"
 makedepends="gtk+-devel SDL2-devel"
-short_desc="A port for UNIX with X11 of the Neko Project II PC-9801 emulator"
+short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
 maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://www.nonakap.org/np2"
 distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
 checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd

From f6efe95f0c706577ab6a00fb33037e3a167694a5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:38:51 -0700
Subject: [PATCH 745/904] xorg-apps: fix license

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

diff --git a/srcpkgs/xorg-apps/template b/srcpkgs/xorg-apps/template
index ac4fd4cc5b0a..49baec9cd9de 100644
--- a/srcpkgs/xorg-apps/template
+++ b/srcpkgs/xorg-apps/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-apps'
 pkgname=xorg-apps
 version=7.6
-revision=8
+revision=9
 build_style=meta
 # xinit is not in xorg-7.5 app directory?!!
 depends="iceauth>=1.0.4 oclock>=1.0.3 sessreg>=1.0.6 setxkbmap>=1.2.0
@@ -16,5 +16,5 @@ depends="iceauth>=1.0.4 oclock>=1.0.3 sessreg>=1.0.6 setxkbmap>=1.2.0
  xwd>=1.0.4 xwininfo>=1.1.1 xwud>=1.0.3"
 short_desc="X.org applications"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
-homepage="http://xorg.freedesktop.org/"
+license="Public Domain"
+homepage="https://www.x.org/wiki/"

From 725ab8a1aa18a78f2b0d2adecfc6365b00507c7b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:41:06 -0700
Subject: [PATCH 746/904] xorg: fix license

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

diff --git a/srcpkgs/xorg/template b/srcpkgs/xorg/template
index 82497c6eb383..5bc0aadbffa4 100644
--- a/srcpkgs/xorg/template
+++ b/srcpkgs/xorg/template
@@ -1,10 +1,10 @@
 # Template file for 'xorg'
 pkgname=xorg
 version=7.6
-revision=5
+revision=6
 build_style=meta
 depends="xorg-fonts xorg-server xorg-apps xorg-input-drivers xorg-video-drivers"
 short_desc="X.org meta-package"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="metapackage"
-homepage="http://xorg.freedesktop.org"
+license="Public Domain"
+homepage="https://www.x.org/wiki/"

From b66af28472ed60b58b6b81bff41fcf56295d0e3a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:26:49 -0700
Subject: [PATCH 747/904] xplanet: fix license, vsed

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

diff --git a/srcpkgs/xplanet/template b/srcpkgs/xplanet/template
index 4650dd2556ca..4418dc58cf5a 100644
--- a/srcpkgs/xplanet/template
+++ b/srcpkgs/xplanet/template
@@ -1,14 +1,14 @@
 # Template file for 'xplanet'
 pkgname=xplanet
 version=1.3.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-freetype"
 hostmakedepends="pkg-config"
 makedepends="pango-devel freetype-devel giflib-devel tiff-devel libXScrnSaver-devel"
 short_desc="Planetary body renderer"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://xplanet.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7
@@ -16,5 +16,5 @@ checksum=4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7
 pre_configure() {
 	# make it build with giflib-5.1.0
 	# see http://wiki.linuxfromscratch.org/blfs/ticket/5076#comment:2
-	sed -i "/[DE]GifCloseFile/s:GifFile:&, NULL:g" src/libimage/gif.c
+	vsed -i "/[DE]GifCloseFile/s:GifFile:&, NULL:g" src/libimage/gif.c
 }

From 8be7c8a8b70e297f56c9fb1b0f2cd28b58cbaeaa Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:30:16 -0700
Subject: [PATCH 748/904] xrick: fix license, template layout

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

diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template
index 42b8a0febe94..3b751dcc6774 100644
--- a/srcpkgs/xrick/template
+++ b/srcpkgs/xrick/template
@@ -1,17 +1,17 @@
 # Template file for 'xrick'
 pkgname=xrick
 version=021212
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=1
 makedepends="SDL-devel zlib-devel"
 short_desc="Clone of Rick Dangerous"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-ish"
-restricted=yes
+license="custom:GPL-ish"
 homepage="http://www.bigorno.net/xrick/"
 distfiles="https://www.bigorno.net/xrick/xrick-${version}.tgz"
 checksum=aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b
+restricted=yes
 
 CFLAGS=-fcommon
 

From ff25ff079a95f8f3718b3ad3392e05b4cf4c40db Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:37:27 -0700
Subject: [PATCH 749/904] xsel: fix license

---
 srcpkgs/xsel/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template
index edc001dba405..614585a5facb 100644
--- a/srcpkgs/xsel/template
+++ b/srcpkgs/xsel/template
@@ -1,12 +1,16 @@
 # Template file for 'xsel'
 pkgname=xsel
 version=1.2.0
-revision=4
+revision=5
 build_style="gnu-configure"
 makedepends="libXt-devel"
 short_desc="Command-line getting and setting the contents of the X selection"
 maintainer="Steven R <dev@styez.com>"
-license="custom"
+license="HPND-sell-variant"
 homepage="http://www.vergenet.net/~conrad/software/xsel/"
 distfiles="http://www.vergenet.net/~conrad/software/xsel/download/xsel-${version}.tar.gz"
 checksum=b927ce08dc82f4c30140223959b90cf65e1076f000ce95e520419ec32f5b141c
+
+post_install() {
+	vlicense COPYING LICENSE
+}

From 61beeb32df5dff4cd578108fa7295baffbe0db28 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:43:49 -0700
Subject: [PATCH 750/904] xsnow: fix license

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

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index a65da4fb2947..965986d92842 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,12 +1,12 @@
 # Template file for 'xsnow'
 pkgname=xsnow
 version=1.42
-revision=2
+revision=3
 hostmakedepends="imake xorg-cf-files"
 makedepends="libXext-devel libXpm-devel libXt-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="xsnow"
+license="custom:xsnow"
 homepage="https://janswaal.home.xs4all.nl/Xsnow"
 distfiles="https://janswaal.home.xs4all.nl/Xsnow/${pkgname}-${version}.tar.gz"
 checksum=d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a

From 2cd1892cd16172698a94a41d394dd893555391dd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:46:14 -0700
Subject: [PATCH 751/904] xspringies: fix license, vsed

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

diff --git a/srcpkgs/xspringies/template b/srcpkgs/xspringies/template
index d9175aee26b0..e01e7d1edafa 100644
--- a/srcpkgs/xspringies/template
+++ b/srcpkgs/xspringies/template
@@ -1,17 +1,17 @@
 # Template file for 'xspringies'
 pkgname=xspringies
 version=1.12
-revision=4
+revision=5
 makedepends="libX11-devel"
 short_desc="Mass and spring simulation system"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-1"
+license="GPL-1.0-or-later"
 homepage="https://web.archive.org/web/20170303034329/http://www.cs.rutgers.edu/~decarlo/software.html"
 distfiles="http://distcache.freebsd.org/ports-distfiles/${pkgname}-${version}.tar.Z>${pkgname}-${version}.tar.gz"
 checksum=08a3e9f60d1f1e15d38d62dd62baab18f6ad57ee139b0ef41452be66e4ad6a28
 
 post_extract() {
-	sed -i '/^CFLAGS/s/=/+=/' Makefile.std
+	vsed -i '/^CFLAGS/s/=/+=/' Makefile.std
 }
 do_build() {
 	make ${makejobs} -f Makefile.std DDIR=/usr/ LIBS="$LDFLAGS -lm -lX11"
@@ -22,5 +22,4 @@ do_install() {
 	vmkdir usr/lib
 	cp -r lib ${DESTDIR}/usr/lib/xspringies
 	vman xspringies.man xspringies.1
-	vlicense COPYING LICENSE
 }

From a7144526573e4e1b5ed64b0d14c8ceaf7eaaef03 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:57:23 -0700
Subject: [PATCH 752/904] xstow: fix license, template layout

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

diff --git a/srcpkgs/xstow/template b/srcpkgs/xstow/template
index 3f3ba847bd40..1e6cea814ce3 100644
--- a/srcpkgs/xstow/template
+++ b/srcpkgs/xstow/template
@@ -1,12 +1,12 @@
-# Template build file for 'xstow'.
+# Template file for 'xstow'
 pkgname=xstow
 version=1.0.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-curses"
 short_desc="Replacement of GNU Stow written in C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://xstow.sourceforge.net"
-license="GPL-2"
 distfiles="$SOURCEFORGE_SITE/xstow/xstow-$version.tar.bz2"
 checksum=6f041f19a5d71667f6a9436d56f5a50646b6b8c055ef5ae0813dcecb35a3c6ef

From 10b71b3318a7ef10ff1015f4123f6ce0182c28f6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 01:00:28 -0700
Subject: [PATCH 753/904] xxkb: fix license

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

diff --git a/srcpkgs/xxkb/template b/srcpkgs/xxkb/template
index 22d09e1a5dd9..0a0e13b3fe20 100644
--- a/srcpkgs/xxkb/template
+++ b/srcpkgs/xxkb/template
@@ -1,14 +1,14 @@
 # Template file for 'xxkb'
 pkgname=xxkb
 version=1.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_target="install install.man"
 hostmakedepends="imake"
 makedepends="libX11-devel libXt-devel libXext-devel libXpm-devel"
 short_desc="Keyboard layout switcher and indicator"
 maintainer="Andrey Raugas <kainonergon@gmail.com>"
-license="PerlArtistic"
+license="Artistic-2.0"
 homepage="https://sourceforge.net/projects/xxkb/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz"
 checksum=ceaa33bed81d8ae5bf77e89787d0736f7564c3de047c35a57bcbf6f4d1888142

From efeff5c71e26a5725391063a69c3a9cc1bbd466e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 18:51:26 -0700
Subject: [PATCH 754/904] xz: fix license, description

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

diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template
index 103308ee4d7e..b7cb987bcff8 100644
--- a/srcpkgs/xz/template
+++ b/srcpkgs/xz/template
@@ -1,12 +1,12 @@
 # Template file for 'xz'
 pkgname=xz
 version=5.2.5
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
-short_desc="The XZ compression utilities"
+short_desc="XZ compression utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Public domain, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+license="Public Domain, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://tukaani.org/xz"
 distfiles="https://tukaani.org/xz/xz-${version}.tar.bz2"
 checksum=5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df

From 062e64dd80d6201e627178b691127738440b8533 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 19:25:46 -0700
Subject: [PATCH 755/904] xzoom: fix license, update homepage and disfiles
 links, vsed

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

diff --git a/srcpkgs/xzoom/template b/srcpkgs/xzoom/template
index fd5c19eb6bed..eaa30662bd6e 100644
--- a/srcpkgs/xzoom/template
+++ b/srcpkgs/xzoom/template
@@ -1,19 +1,19 @@
 # Template file for 'xzoom'
 pkgname=xzoom
 version=0.3
-revision=1
+revision=2
 hostmakedepends="imake"
 makedepends="libXt-devel libXext-devel"
 short_desc="Magnify part of X display, with real-time updates"
 maintainer="Daniel Santana <daniel@santana.tech>"
-license="Custom"
-homepage="http://sunsite.unc.edu/pub/linux/libs/X/"
-distfiles="http://webdiis.unizar.es/pub/unix/X11/${pkgname}-${version}.tgz"
+license="custom:xzoom"
+homepage="http://www.ibiblio.org/pub/linux/libs/X/"
+distfiles="http://www.ibiblio.org/pub/linux/libs/X/xzoom-${version}.tgz"
 checksum=b26bfd692d3e1d30e8d524d4018fc3f0fe847983a2778a4a2496784bfc2df44b
 
 do_build() {
 	CC=cc xmkmf
-	sed -i "s@-O2@$CFLAGS@" ./Makefile
+	vsed -i "s@-O2@$CFLAGS@" ./Makefile
 	make CC=$CC CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 

From 60e97a5942525a2b0d5e015996259015f951464c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 09:44:05 -0700
Subject: [PATCH 756/904] wcalc: fix license, description

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

diff --git a/srcpkgs/wcalc/template b/srcpkgs/wcalc/template
index efdb2e9bb6c5..e1effe3ea49f 100644
--- a/srcpkgs/wcalc/template
+++ b/srcpkgs/wcalc/template
@@ -1,12 +1,12 @@
 # Template file for 'wcalc'
 pkgname=wcalc
 version=2.5
-revision=5
+revision=6
 build_style=gnu-configure
 makedepends="readline-devel mpfr-devel gmp-devel"
-short_desc="A powerful arbitrary-precision calculator"
+short_desc="Powerful arbitrary-precision calculator"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://w-calc.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/w-calc/${pkgname}-${version}.tar.bz2"
 checksum=0e2c17c20f935328dcdc6cb4c06250a6732f9ee78adf7a55c01133960d6d28ee

From cac1004959723427cf0a21374276c4d76a31db30 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 09:48:53 -0700
Subject: [PATCH 757/904] webcat: fix license, template layout

GPL-3.0-only is a best safe guess based on the license in the template
already. Github nor the source declare a license, but the maintainer is
the author so I'm assuming they know what they are doing.
---
 srcpkgs/webcat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 5d6c459dd93b..519146f68d6b 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,13 +1,13 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=15
-go_import_path="github.com/thypon/webcat"
+revision=16
 build_style=go
+go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"
 short_desc="WebSocket Netcat"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://github.com/thypon/webcat"
 distfiles="https://github.com/thypon/webcat/archive/v${version}.tar.gz"
 checksum=5b3be1cb8deb08f144d674a0bf23f97a692ebb601666d3a38df6e80b2e68d0b7

From dd244c390193c4509eb101858aeb743646bdea4d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 09:58:14 -0700
Subject: [PATCH 758/904] websocketd: fix license, template layout

---
 srcpkgs/websocketd/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 80857258f371..110a42b2a91b 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -3,11 +3,15 @@ pkgname=websocketd
 version=0.4.1
 revision=1
 build_style=go
+go_import_path="github.com/joewalnes/websocketd"
 hostmakedepends="git"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="BSD"
-go_import_path="github.com/joewalnes/websocketd"
+license="BSD-2-Clause"
 homepage="https://github.com/joewalnes/websocketd"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=6b8fe0fad586d794e002340ee597059b2cfc734ba7579933263aef4743138fe5
+
+post_install() {
+	vlicense LICENSE
+}

From 0bc51cb8a92da4b2237609a366a6de8e7e2653be Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 10:00:35 -0700
Subject: [PATCH 759/904] which: fix license, template layout

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

diff --git a/srcpkgs/which/template b/srcpkgs/which/template
index 19eed86af2f8..bc0ae49067b4 100644
--- a/srcpkgs/which/template
+++ b/srcpkgs/which/template
@@ -6,7 +6,7 @@ bootstrap=yes
 build_style=gnu-configure
 short_desc="Displays where a particular program in your path is located"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/which"
-license="GPL-3"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad

From 34a402edde343afffdfd7b5c4dafc1a3952f6d9d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 11:33:56 -0700
Subject: [PATCH 760/904] wireless_tools: fix license

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

diff --git a/srcpkgs/wireless_tools/template b/srcpkgs/wireless_tools/template
index 145c54d114ec..2acdb5cca702 100644
--- a/srcpkgs/wireless_tools/template
+++ b/srcpkgs/wireless_tools/template
@@ -1,12 +1,12 @@
 # Template file for 'wireless_tools'
 pkgname=wireless_tools
 version=29
-revision=9
+revision=10
 wrksrc="wireless_tools.${version}"
 hostmakedepends="wget"
 short_desc="Set of tools allowing to manipulate the Wireless Extensions"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 distfiles="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${version}.tar.gz"
 checksum=6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1

From 87ce4f5a729ccbbf2510c688200c38297ca5ca9f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 11:54:57 -0700
Subject: [PATCH 761/904] wmclock: fix license

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

diff --git a/srcpkgs/wmclock/template b/srcpkgs/wmclock/template
index bfede3a1f734..bf185034014f 100644
--- a/srcpkgs/wmclock/template
+++ b/srcpkgs/wmclock/template
@@ -1,14 +1,14 @@
 # Template file for 'wmclock'
 pkgname=wmclock
 version=1.0.16
-revision=1
+revision=2
 wrksrc="dockapps-daaf3aa"
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
 makedepends="libX11-devel libXpm-devel libXext-devel"
 short_desc="Clock Dockapp for Window Maker"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.dockapps.net/wmclock"
 distfiles="http://www.dockapps.net/download/wmclock-${version}.tar.gz"
 checksum=3f8bb5df3160d5919d19cf26d45449e6e1260d2a2f485e61f35e64a49639a2d3

From 45006a354d8ec326460111f5bb9cebfefda43527 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 12:51:52 -0700
Subject: [PATCH 762/904] wmfs: fix license, homepage

Note that the tag that the package uses appears to have been deleted.
There is a lot of things in this project that seem sketchy but this
fixes the most egregious of them.
---
 srcpkgs/wmfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wmfs/template b/srcpkgs/wmfs/template
index 17f350c60adc..cf10d345e8a6 100644
--- a/srcpkgs/wmfs/template
+++ b/srcpkgs/wmfs/template
@@ -1,7 +1,7 @@
 # Template file for 'wmfs'
 pkgname=wmfs
 version=201104
-revision=6
+revision=7
 build_style=configure
 configure_args="--prefix /usr --man-prefix /usr/share/man --xdg-config-dir /etc/xdg"
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ makedepends="libXft-devel libXrender-devel fontconfig-devel libXinerama-devel li
 conf_files="/etc/xdg/wmfs/wmfsrc"
 short_desc="Window Manager From Scratch"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
-homepage="http://wmfs.info/"
+license="BSD-3-Clause"
+homepage="https://github.com/xorg62/wmfs"
 distfiles="https://github.com/downloads/xorg62/wmfs/wmfs-${version}.tar.gz"
 checksum=c28b7cec28a6e3f2bc38a136fb1773bab8ec8f48c69ebe25c24192f96e782d64
 

From 845e191aad49f3d43d1fda4bf7c54b9ab38d0179 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 14:13:40 -0700
Subject: [PATCH 763/904] wmii: fix license, verify python version

---
 srcpkgs/wmii/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template
index 738f74350d6d..fd2c01e4c166 100644
--- a/srcpkgs/wmii/template
+++ b/srcpkgs/wmii/template
@@ -1,17 +1,17 @@
 # Template file for 'wmii'
 pkgname=wmii
 version=3.9.2
-revision=6
+revision=7
 wrksrc=${pkgname}+ixp-${version}
 hostmakedepends="pkg-config"
 makedepends="libXrandr-devel libXft-devel libXinerama-devel"
 short_desc="Lightweight, dynamic window manager for X11"
 maintainer="Zach L. <koni@archlinux.us>"
-license="GPL-3"
+license="MIT"
 homepage="https://code.google.com/p/wmii/"
 distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wmii/wmii+ixp-${version}.tbz"
 checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
-python_version=2 #unverified
+python_version=2
 
 CFLAGS="-fcommon"
 
@@ -19,6 +19,8 @@ do_build() {
 	LDFLAGS+=" -lX11 -lXrender"
 	make CC="$CC -c" AR="$AR crs" LD=$CC RANLIB=$RANLIB PREFIX=/usr
 }
+
 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install
+	vlicense LICENSE
 }

From 8eac621453472e2aca5c670f38fea9bedaaae796 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 14:14:11 -0700
Subject: [PATCH 764/904] wmsystemtray: fix license

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

diff --git a/srcpkgs/wmsystemtray/template b/srcpkgs/wmsystemtray/template
index f0a5c1c96247..39776e0b273b 100644
--- a/srcpkgs/wmsystemtray/template
+++ b/srcpkgs/wmsystemtray/template
@@ -1,13 +1,13 @@
 # Template file for 'wmsystemtray'
 pkgname=wmsystemtray
 version=1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXfixes-devel libXmu-devel libXpm-devel"
 short_desc="System tray dockapp for Window Maker"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/wmsystemtray/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9

From 2f6b039479aab2ad4e99e1a8bc331401dee1a3c8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 14:16:08 -0700
Subject: [PATCH 765/904] wol: fix license

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

diff --git a/srcpkgs/wol/template b/srcpkgs/wol/template
index 922ff8358041..52d104d0e71a 100644
--- a/srcpkgs/wol/template
+++ b/srcpkgs/wol/template
@@ -1,13 +1,13 @@
 # Template file for 'wol'
 pkgname=wol
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="jm_cv_func_working_malloc=yes"
 hostmakedepends="perl"
 short_desc="Wakes up hardware that is Magic Packet compliant"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://wake-on-lan.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/ahh/${pkgname}-${version}.tar.gz"
 checksum=e0086c9b9811df2bdf763ec9016dfb1bcb7dba9fa6d7858725b0929069a12622

From c67585a751d5c4ab3114f5ae8d5d0bffcd4d6b3a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 14:24:52 -0700
Subject: [PATCH 766/904] wpa_actiond: fix license, template layout

This does not fix the currently broken homepage as Arch Linux appears to
have scrubbed it from the face of the earth. However, the source archive
download still works so it isn't entirely dead yet.
---
 srcpkgs/wpa_actiond/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wpa_actiond/template b/srcpkgs/wpa_actiond/template
index 555468a6f503..ae4c78fedf13 100644
--- a/srcpkgs/wpa_actiond/template
+++ b/srcpkgs/wpa_actiond/template
@@ -1,14 +1,12 @@
 # Template file for 'wpa_actiond'
 pkgname=wpa_actiond
 version=1.4
-revision=1
+revision=2
 build_style=gnu-makefile
-hostmakedepends=""
-makedepends=""
 depends="wpa_supplicant"
-short_desc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
+short_desc="Daemon that connects to wpa_supplicant and handles connection events"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://projects.archlinux.org/wpa_actiond.git/"
 distfiles="https://sources.archlinux.org/other/wpa_actiond/${pkgname}-${version}.tar.xz"
 checksum=e0e65e7c52a32796a0ff855ab18aa0b237d6b9afc87d4008c0380735abcb1a54

From bc250fe2617d7019cb010ee92d67eb0a1220b5f6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 14:30:10 -0700
Subject: [PATCH 767/904] wv: fix license, description

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

diff --git a/srcpkgs/wv/template b/srcpkgs/wv/template
index 0a1b96f093c3..188b817d0b07 100644
--- a/srcpkgs/wv/template
+++ b/srcpkgs/wv/template
@@ -1,13 +1,13 @@
 # Template file for 'wv'
 pkgname=wv
 version=1.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libpng-devel libglib-devel libxml2-devel libgsf-devel"
-short_desc="A library which allows access to Microsoft Word files"
+short_desc="Library which allows access to Microsoft Word files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://wvware.sourceforge.net/"
 distfiles="http://www.abisource.com/downloads/wv/${version}/wv-${version}.tar.gz"
 checksum=4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d

From 9c86b7588d951bae0926f50ae223f4270504d755 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 14:39:16 -0700
Subject: [PATCH 768/904] wvdial: fix license, template layout

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

diff --git a/srcpkgs/wvdial/template b/srcpkgs/wvdial/template
index 3813dea5f5ef..f383767cc7ca 100644
--- a/srcpkgs/wvdial/template
+++ b/srcpkgs/wvdial/template
@@ -1,14 +1,14 @@
 # Template file for 'wvdial'
 pkgname=wvdial
 version=1.61
-revision=7
+revision=8
 build_style=gnu-configure
-short_desc="Point-to-Point Protocol dialer"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2"
 hostmakedepends="pkg-config"
 makedepends="wvstreams-devel"
 depends="ppp"
+short_desc="Point-to-Point Protocol dialer"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.0-only"
 homepage="https://code.google.com/p/wvstreams/"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=5753d2005115aa4e365a1638f4eb6c076d4e2deafa46c3de38964918e7f62709

From d03cb956b878b021d0b1533f85687fe8b3ef9467 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 14:48:21 -0700
Subject: [PATCH 769/904] wvstreams: fix license, template layout

sgn: remove --sbindir
---
 srcpkgs/wvstreams/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 068c21944270..7f97af1b3bf0 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,16 +1,16 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=20
+revision=21
 build_style=gnu-configure
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2"
+configure_args="--without-dbus --without-tcl --without-qt"
+makedepends="openssl-devel zlib-devel"
 short_desc="Library for doing network in C++"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.0-only"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
-configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"
 replaces="uniconf>=0"
 

From 5212eb62e149fd71a6025673928192d1482c0d7c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 16:34:32 -0700
Subject: [PATCH 770/904] wxPython: fix license, description, template layout,
 http->https

Close: #31704
---
 srcpkgs/wxPython/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template
index ffbee38c50cd..328fa26459cb 100644
--- a/srcpkgs/wxPython/template
+++ b/srcpkgs/wxPython/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython'
 pkgname=wxPython
 version=3.0.2.0
-revision=10
+revision=11
 wrksrc="${pkgname}-src-${version}"
 hostmakedepends="pkg-config"
 makedepends="
@@ -9,11 +9,10 @@ makedepends="
  libSM-devel MesaLib-devel glu-devel
  libnotify-devel python-devel wxWidgets-devel"
 depends="python"
-pycompile_module="wx-3.0-gtk2 wxversion.py"
-short_desc="The wxWidgets GUI toolkit library (Python Bindings)"
+short_desc="Python Bindings for the wxWidgets GUI toolkit library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.wxpython.org/"
-license="wxWindows"
+license="WxWindows-exception-3.1"
+homepage="https://www.wxpython.org/"
 distfiles="${SOURCEFORGE_SITE}/wxpython/${pkgname}-src-${version}.tar.bz2"
 checksum=d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61
 

From fe007a3d4e50b4e5fae08b1efe22e535b6156089 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 8 Jun 2021 10:12:42 -0700
Subject: [PATCH 771/904] vapoursynth-mvtools: fix license

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

diff --git a/srcpkgs/vapoursynth-mvtools/template b/srcpkgs/vapoursynth-mvtools/template
index 6966829ea3a5..f6cd5e1cd9e4 100644
--- a/srcpkgs/vapoursynth-mvtools/template
+++ b/srcpkgs/vapoursynth-mvtools/template
@@ -1,14 +1,14 @@
 # Template file for 'vapoursynth-mvtools'
 pkgname=vapoursynth-mvtools
 version=23
-revision=1
+revision=2
 archs="x86_64* i686*"
 build_style=meson
 hostmakedepends="pkg-config libtool nasm"
 makedepends="fftw-devel vapoursynth-devel"
 short_desc="Set of filters for motion estimation and compensation"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://avisynth.org.ru/mvtools/mvtools2.html"
 distfiles="https://github.com/dubhater/vapoursynth-mvtools/archive/v${version}.tar.gz"
 checksum=3b5fdad2b52a2525764510a04af01eab3bc5e8fe6a02aba44b78955887a47d44

From ba0d893a27251437431b7cfde6cf45538e2e80bb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 8 Jun 2021 10:21:07 -0700
Subject: [PATCH 772/904] vbindiff: fix license, http->https

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

diff --git a/srcpkgs/vbindiff/template b/srcpkgs/vbindiff/template
index b03918491540..257e5e7ab1a0 100644
--- a/srcpkgs/vbindiff/template
+++ b/srcpkgs/vbindiff/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 makedepends="ncurses-devel"
 short_desc="Visual Binary Diff"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
-homepage="http://www.cjmweb.net/vbindiff/"
+license="GPL-2.0-or-later"
+homepage="https://www.cjmweb.net/vbindiff/"
 distfiles="${homepage}/${pkgname}-${version/.beta/_beta}.tar.gz"
 checksum=f04da97de993caf8b068dcb57f9de5a4e7e9641dc6c47f79b60b8138259133b8

From 3c56f57c6397ea0a106b3eab82824c256d88734c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 8 Jun 2021 10:26:01 -0700
Subject: [PATCH 773/904] vde2: fix license

Note that the project has moved from sourceforge to github but they
haven't tagged a new release since the move so updating would be more
annoying than its worth right now.
---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 5d0efce366ab..b975d61b5ea7 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,7 +1,7 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=23
+revision=24
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
@@ -15,7 +15,7 @@ conf_files="
 	/etc/vde2/libvdemgmt/sendcmd.rc"
 short_desc="Virtual Distributed Ethernet"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1, BSD"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
 homepage="http://sourceforge.net/projects/vde/"
 distfiles="${SOURCEFORGE_SITE}/vde/vde2-$version.tar.bz2"
 checksum=cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542

From 176cf706908acb1719ac9f4802754fce10c5bd96 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 8 Jun 2021 10:47:17 -0700
Subject: [PATCH 774/904] vdesk: fix license, description

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

diff --git a/srcpkgs/vdesk/template b/srcpkgs/vdesk/template
index af1e5943b2a7..4dfaf62dc5de 100644
--- a/srcpkgs/vdesk/template
+++ b/srcpkgs/vdesk/template
@@ -1,12 +1,12 @@
 # Template file for 'vdesk'
 pkgname=vdesk
 version=1.2
-revision=3
+revision=4
 build_style=gnu-configure
 makedepends="libX11-devel"
-short_desc="A lightweight virtual desktop manager"
+short_desc="Lightweight virtual desktop manager"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:ISC-like"
 homepage="http://offog.org/code/vdesk.html"
 distfiles="http://offog.org/files/${pkgname}-${version}.tar.gz"
 checksum=4ac9af40591abcb3a99dea9331933182af7a7c4d0c2eec43be37cf2c21dfa792

From 04623f628fb2dafa953eb02efc1b8d0d721a4bdb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 00:09:30 -0700
Subject: [PATCH 775/904] vilistextum: fix license

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

diff --git a/srcpkgs/vilistextum/template b/srcpkgs/vilistextum/template
index aa10c3427fe5..e9921c75c8ba 100644
--- a/srcpkgs/vilistextum/template
+++ b/srcpkgs/vilistextum/template
@@ -1,13 +1,13 @@
 # Template file for 'vilistextum'
 pkgname=vilistextum
 version=2.6.9
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-multibyte --with-unicode-locale=en_US.UTF-8"
 hostmakedepends="automake"
 short_desc="Fault-tolerant HTML to text converter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://bhaak.net/vilistextum"
 distfiles="http://bhaak.net/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=3a16b4d70bfb144e044a8d584f091b0f9204d86a716997540190100c20aaf88d

From 15416798d06e2c5220e3361ac869ba32ed08cfa7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 09:16:45 -0700
Subject: [PATCH 776/904] vkeybd: fix license, update homepage, template layout

sgn: rewrite template
Close: #31694
---
 srcpkgs/vkeybd/template | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/vkeybd/template b/srcpkgs/vkeybd/template
index 2b282440fddc..e53246ba3b80 100644
--- a/srcpkgs/vkeybd/template
+++ b/srcpkgs/vkeybd/template
@@ -1,25 +1,30 @@
 # Template file for 'vkeybd'
 pkgname=vkeybd
 version=0.1.18d
-revision=1
+revision=2
 wrksrc=$pkgname
 hostmakedepends="tcl"
 makedepends="alsa-lib-devel tk-devel"
-short_desc="A virtual MIDI keyboard for X"
+short_desc="Virtual MIDI keyboard for X"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
-homepage="http://www.alsa-project.org/~iwai/alsa.html"
+license="GPL-2.0-or-later"
+homepage="https://github.com/tiwai/vkeybd"
 distfiles="http://ftp.suse.com/pub/people/tiwai/$pkgname/$pkgname-$version.tar.bz2"
 checksum=aa683ed57592489e05fdd898368abe3ee245a4d5829385cfe5edb81764590704
-configure_args="PREFIX=/usr USE_ALSA=1 USE_AWE=0 USE_MIDI=0"
+
+_run_make() {
+	local TCL_VERSION
+	TCL_VERSION=$(echo 'puts [info tclversion]' | tclsh)
+	make CC="$CC" COPTFLAGS="$CFLAGS" DESTDIR=${DESTDIR} \
+		PREFIX=/usr USE_ALSA=1 USE_AWE=0 USE_MIDI=0 \
+		TCL_VERSION=${TCL_VERSION} "$@"
+}
 
 do_build() {
-	echo 'puts [info tclversion]' | tclsh > tcl-ver
-	export configure_args+=" TCL_VERSION=\"$(cat tcl-ver)\""
-	make CC="$CC" COPTFLAGS="$CFLAGS" ${configure_args} ${makejobs}
+	_run_make ${makejobs}
 }
 
 do_install() {
-	make ${configure_args} DESTDIR="$DESTDIR" install-all
+	_run_make DESTDIR=${DESTDIR} install-all
 	vdoc README
 }

From ece83363e88c5a9c93e1a80d65a0b4a98b898393 Mon Sep 17 00:00:00 2001
From: 674Y3r <87250374+674Y3r@users.noreply.github.com>
Date: Sun, 22 Aug 2021 02:18:36 +0200
Subject: [PATCH 777/904] kblocks: update to 21.08.0.

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

diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template
index 0d851aad7b29..c7bc5b1bc675 100644
--- a/srcpkgs/kblocks/template
+++ b/srcpkgs/kblocks/template
@@ -1,6 +1,6 @@
 # Template file for 'kblocks'
 pkgname=kblocks
-version=21.04.0
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kblocks"
 distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz"
-checksum=f678d652875cdad8612fc572ad86970a716e7701c9d246fdf6a621fda3232206
+checksum=083894f4def771ae116b0c5f635f59cab6d51993913d5d281e0834f79ad0c3c5

From 434028bdf0bda830a8ec923e4b179319147809a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 22 Aug 2021 19:18:45 +0200
Subject: [PATCH 778/904] miniupnpd: update to 2.2.3.

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

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index 15d921dbe631..2886dd97465f 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -1,6 +1,6 @@
 # Template file for 'miniupnpd'
 pkgname=miniupnpd
-version=2.2.2
+version=2.2.3
 revision=1
 build_style=configure
 configure_args="
@@ -16,13 +16,14 @@ conf_files="
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
 makedepends="libnfnetlink-devel iptables-devel openssl-devel"
+checkdepends="iproute2 which"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://miniupnp.free.fr"
 changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpd-${version}.tar.gz"
 distfiles="http://miniupnp.free.fr/files/miniupnpd-${version}.tar.gz"
-checksum=4b01c403d01c6ab140c9e4e744c89cdb66cbe25145d7a0d4566cc3fdcc0240c3
+checksum=f89c310ce9575183af3fec61af65e548f85114133df8caaaa9e204c13b7a9da5
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 48c86eb5b2a8e924583060ecf6c766d35126e9f1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Aug 2021 12:33:26 +0200
Subject: [PATCH 779/904] parallel: update to 20210822.

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

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index bb1495812d24..f42c16662edf 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20210722
+version=20210822
 revision=1
 build_style=gnu-configure
 depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=3239094bc043957be191e1e4376716ef0d1b369e545b5bf7d7824b7d46284a49
+checksum=781659ed2726ef8eafda7e7da898b2488b0c6d3f9251786d218a5c81b1e83822
 
 pre_configure() {
 	# no html and pdf doc

From e3c1efbca9dd71bdbd8b39b405b1f126fc79bf15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Aug 2021 12:45:21 +0200
Subject: [PATCH 780/904] xfig: update to 3.2.8b.

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

diff --git a/srcpkgs/xfig/template b/srcpkgs/xfig/template
index 1ae7e04a4363..76e3929f32a2 100644
--- a/srcpkgs/xfig/template
+++ b/srcpkgs/xfig/template
@@ -1,7 +1,7 @@
 # Template file for 'xfig'
 pkgname=xfig
-version=3.2.8a
-revision=2
+version=3.2.8b
+revision=1
 build_style="gnu-configure"
 hostmakedepends="fig2dev ghostscript netpbm"
 makedepends="libXaw-devel libXaw3d-devel libXi-devel libXmu-devel libXpm-devel
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="custom:xfig"
 homepage="http://mcj.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz"
-checksum=ba43c0ea85b230d3efa5a951a3239e206d0b033d044c590a56208f875f888578
+checksum=b2cc8181cfb356f6b75cc28771970447f69aba1d728a2dac0e0bcf1aea7acd3a
 
 post_extract() {
 	vsed -i 's/spell/aspell/' app-defaults/Fig.in

From be218308485e38d3ccbbc282a2e15b02154baf5f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Aug 2021 12:45:24 +0200
Subject: [PATCH 781/904] fig2dev: update to 3.2.8b.

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

diff --git a/srcpkgs/fig2dev/template b/srcpkgs/fig2dev/template
index 87bdbd3d8ad6..84f1c6c1691f 100644
--- a/srcpkgs/fig2dev/template
+++ b/srcpkgs/fig2dev/template
@@ -1,6 +1,6 @@
 # Template file for 'fig2dev'
 pkgname=fig2dev
-version=3.2.8a
+version=3.2.8b
 revision=1
 build_style=gnu-configure
 configure_args="--enable-transfig"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="custom:MIT-like"
 homepage="http://www.xfig.org/"
 distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz"
-checksum=6336ac492d0f71dfb7a1dd8f4d78eae17aa57a34f743d4e5ba9814991c2da7ae
+checksum=418a164aa9fad72d25bb4fec8d7b452fe3a2f12f990cf22e05c0eb16cecb68cb
 replaces="transfig>=0"
 
 post_install() {

From 66cbb4b05826c47ebe5bb9120af1f76e315971cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Aug 2021 14:22:06 +0200
Subject: [PATCH 782/904] openssh: update to 8.7p1.

---
 srcpkgs/openssh/INSTALL.msg | 4 ----
 srcpkgs/openssh/template    | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 srcpkgs/openssh/INSTALL.msg

diff --git a/srcpkgs/openssh/INSTALL.msg b/srcpkgs/openssh/INSTALL.msg
deleted file mode 100644
index 0143e089f1a2..000000000000
--- a/srcpkgs/openssh/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-CAUTION: After updating from OpenSSH <=8.1 to OpenSSH 8.2, the existing sshd
-will not allow new connections.  **Restart OpenSSH immediately** after this
-update to ensure you still can log in!
-Install 'openssh-sk-helper' to use FIDO authenticators on the client.
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 95c8b31073b3..b921bc797c47 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,6 +1,6 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=8.6p1
+version=8.7p1
 revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
@@ -23,7 +23,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"
 homepage="https://www.openssh.com"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae
+checksum=7ca34b8bb24ae9e50f33792b7091b3841d7e1b440ff57bc9fabddf01e2ed1e24
 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
 make_dirs="/var/chroot/ssh 0755 root root"
 

From 01b93d0f740a749141011cc0996381fb8efd0437 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Aug 2021 14:24:53 +0200
Subject: [PATCH 783/904] gnome-ssh-askpass: update to 8.7p1.

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

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index b12f91338bf8..4fe1d04d5c21 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=8.6p1
+version=8.7p1
 revision=1
 wrksrc="openssh-${version}"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
 homepage="http://www.openssh.org"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz"
-checksum=c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae
+checksum=7ca34b8bb24ae9e50f33792b7091b3841d7e1b440ff57bc9fabddf01e2ed1e24
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass

From 4c52a810101a68fa1ba1c803a1fc3be5d00e0f1c Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 22 Aug 2021 23:31:52 +0200
Subject: [PATCH 784/904] lazygit: update to 0.29.

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

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index f7a46d98c1d3..1af14b8ad150 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.28.2
+version=0.29
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=4925089bff0fee55ccc495fdcc2d396e48e04d16ad8d6681b6cce7b10eefa2b4
+checksum=f25de2ddab99d2ea06aae87e0be6365033b2ceb8efe94807c8b074884d5e8e38
 
 post_install() {
 	vlicense LICENSE

From b830cf20543f901e1cb0d96fe2ff6ec7bb81d2be Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Wed, 18 Aug 2021 22:15:30 +0100
Subject: [PATCH 785/904] delve: update to 1.7.1.

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

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index 4c9d30a59488..43e09ec913c0 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,6 +1,6 @@
 # Template file for 'delve'
 pkgname=delve
-version=1.6.1
+version=1.7.1
 revision=1
 build_style=go
 go_import_path=github.com/go-delve/delve/cmd/dlv
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/go-delve/delve"
 distfiles="https://github.com/go-delve/delve/archive/v${version}.tar.gz"
-checksum=e73f7fc063632268d3bdf53486aeafd98cceb8f86f4af56903dedfebaefe690d
+checksum=0734b86d48291749ba2537fa6c03e4c3451628f630055c877789e0346db8d67d
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|arm*|ppc*) broken=yes ;;

From 7f18e90d0cc874cea61e995d0f6b577bb2d618fe Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Mon, 23 Aug 2021 18:21:23 +0300
Subject: [PATCH 786/904] mozc: update to 2.26.4472.102.

sgn: Correct the version, it's 2.26.4472.102 not 2.26.4472.100
Close: #32646
---
 srcpkgs/mozc/patches/unsigned-int.patch | 200 ------------------------
 srcpkgs/mozc/template                   |   9 +-
 2 files changed, 5 insertions(+), 204 deletions(-)
 delete mode 100644 srcpkgs/mozc/patches/unsigned-int.patch

diff --git a/srcpkgs/mozc/patches/unsigned-int.patch b/srcpkgs/mozc/patches/unsigned-int.patch
deleted file mode 100644
index 55ff9f83c81b..000000000000
--- a/srcpkgs/mozc/patches/unsigned-int.patch
+++ /dev/null
@@ -1,200 +0,0 @@
---- a/mozc/src/gui/word_register_dialog/word_register_dialog.cc
-+++ b/mozc/src/gui/word_register_dialog/word_register_dialog.cc
-@@ -94,7 +94,7 @@ QString GetEnv(const char *envname) {
-       return QString::fromUtf16(reinterpret_cast<const ushort *>(buffer.get()));
-     } else {
-       // This is a fallback just in case.
--      return QString::fromUcs4(reinterpret_cast<const uint *>(buffer.get()));
-+      return QString::fromUcs4(reinterpret_cast<const unsigned *>(buffer.get()));
-     }
-   }
-   return QLatin1String("");
---- a/mozc/src/unix/fcitx/surrounding_text_util.cc
-+++ b/mozc/src/unix/fcitx/surrounding_text_util.cc
-@@ -41,10 +41,10 @@
- namespace mozc {
- namespace fcitx {
- 
--bool SurroundingTextUtil::GetSafeDelta(uint from, uint to, int32 *delta) {
-+bool SurroundingTextUtil::GetSafeDelta(unsigned from, unsigned to, int32 *delta) {
-   DCHECK(delta);
- 
--  static_assert(sizeof(int64) >= sizeof(uint),
-+  static_assert(sizeof(int64) >= sizeof(unsigned),
-                 "int64 must be sufficient to store a guint value.");
-   static_assert(sizeof(int64) == sizeof(llabs(0)),
-                 "|llabs(0)| must returns a 64-bit integer.");
-@@ -113,8 +113,8 @@ bool SearchAnchorPosForward(
-     const std::string &surrounding_text,
-     const std::string &selected_text,
-     size_t selected_chars_len,
--    uint cursor_pos,
--    uint *anchor_pos) {
-+    unsigned cursor_pos,
-+    unsigned *anchor_pos) {
- 
-   ConstChar32Iterator iter(surrounding_text);
-   // Move |iter| to cursor pos.
-@@ -137,15 +137,15 @@ bool SearchAnchorPosBackward(
-     const std::string &surrounding_text,
-     const std::string &selected_text,
-     size_t selected_chars_len,
--    uint cursor_pos,
--    uint *anchor_pos) {
-+    unsigned cursor_pos,
-+    unsigned *anchor_pos) {
-   if (cursor_pos < selected_chars_len) {
-     return false;
-   }
- 
-   ConstChar32Iterator iter(surrounding_text);
-   // Skip |iter| to (potential) anchor pos.
--  const uint skip_count = cursor_pos - selected_chars_len;
-+  const unsigned skip_count = cursor_pos - selected_chars_len;
-   DCHECK_LE(skip_count, cursor_pos);
-   if (!Skip(&iter, skip_count)) {
-     return false;
-@@ -164,8 +164,8 @@ bool SearchAnchorPosBackward(
- bool SurroundingTextUtil::GetAnchorPosFromSelection(
-     const std::string &surrounding_text,
-     const std::string &selected_text,
--    uint cursor_pos,
--    uint *anchor_pos) {
-+    unsigned cursor_pos,
-+    unsigned *anchor_pos) {
-   DCHECK(anchor_pos);
- 
-   if (surrounding_text.empty()) {
-@@ -196,8 +196,8 @@ bool GetSurroundingText(FcitxInstance* i
-         return false;
-     }
- 
--    uint cursor_pos = 0;
--    uint anchor_pos = 0;
-+    unsigned cursor_pos = 0;
-+    unsigned anchor_pos = 0;
-     char* str = NULL;
- 
-     if (!FcitxInstanceGetSurroundingText(instance, ic, &str, &cursor_pos, &anchor_pos)) {
-@@ -211,7 +211,7 @@ bool GetSurroundingText(FcitxInstance* i
-         const char* primary = NULL;
- 
-         if ((primary = FcitxClipboardGetPrimarySelection(instance, NULL)) != NULL) {
--            uint new_anchor_pos = 0;
-+            unsigned new_anchor_pos = 0;
-             const std::string primary_text(primary);
-             if (SurroundingTextUtil::GetAnchorPosFromSelection(
-                 surrounding_text, primary_text,
---- a/mozc/src/unix/fcitx/surrounding_text_util.h
-+++ b/mozc/src/unix/fcitx/surrounding_text_util.h
-@@ -55,7 +55,7 @@ class SurroundingTextUtil {
-   // Returns true when neither |abs(delta)| nor |-delta| does not cause
-   // integer overflow, that is, |delta| is in a safe range.
-   // Returns false otherwise.
--  static bool GetSafeDelta(uint from, uint to, int32 *delta);
-+  static bool GetSafeDelta(unsigned from, unsigned to, int32 *delta);
- 
-   // Returns true if
-   // 1. |surrounding_text| contains |selected_text|
-@@ -71,8 +71,8 @@ class SurroundingTextUtil {
-   static bool GetAnchorPosFromSelection(
-       const std::string &surrounding_text,
-       const std::string &selected_text,
--      uint cursor_pos,
--      uint *anchor_pos);
-+      unsigned cursor_pos,
-+      unsigned *anchor_pos);
- 
-  private:
-   DISALLOW_IMPLICIT_CONSTRUCTORS(SurroundingTextUtil);
---- a/mozc/src/unix/fcitx5/surrounding_text_util.cc
-+++ b/mozc/src/unix/fcitx5/surrounding_text_util.cc
-@@ -43,10 +43,10 @@ namespace fcitx {
- 
- using namespace mozc;
- 
--bool SurroundingTextUtil::GetSafeDelta(uint from, uint to, int32 *delta) {
-+bool SurroundingTextUtil::GetSafeDelta(unsigned from, unsigned to, int32 *delta) {
-   DCHECK(delta);
- 
--  static_assert(sizeof(int64) >= sizeof(uint),
-+  static_assert(sizeof(int64) >= sizeof(unsigned),
-                 "int64 must be sufficient to store a guint value.");
-   static_assert(sizeof(int64) == sizeof(llabs(0)),
-                 "|llabs(0)| must returns a 64-bit integer.");
-@@ -110,8 +110,8 @@ bool StartsWith(ConstChar32Iterator *ite
- // Otherwise returns false.
- bool SearchAnchorPosForward(const std::string &surrounding_text,
-                             const std::string &selected_text,
--                            size_t selected_chars_len, uint cursor_pos,
--                            uint *anchor_pos) {
-+                            size_t selected_chars_len, unsigned cursor_pos,
-+                            unsigned *anchor_pos) {
-   ConstChar32Iterator iter(surrounding_text);
-   // Move |iter| to cursor pos.
-   if (!Skip(&iter, cursor_pos)) {
-@@ -131,15 +131,15 @@ bool SearchAnchorPosForward(const std::s
- // Otherwise returns false.
- bool SearchAnchorPosBackward(const std::string &surrounding_text,
-                              const std::string &selected_text,
--                             size_t selected_chars_len, uint cursor_pos,
--                             uint *anchor_pos) {
-+                             size_t selected_chars_len, unsigned cursor_pos,
-+                             unsigned *anchor_pos) {
-   if (cursor_pos < selected_chars_len) {
-     return false;
-   }
- 
-   ConstChar32Iterator iter(surrounding_text);
-   // Skip |iter| to (potential) anchor pos.
--  const uint skip_count = cursor_pos - selected_chars_len;
-+  const unsigned skip_count = cursor_pos - selected_chars_len;
-   DCHECK_LE(skip_count, cursor_pos);
-   if (!Skip(&iter, skip_count)) {
-     return false;
-@@ -157,7 +157,7 @@ bool SearchAnchorPosBackward(const std::
- 
- bool SurroundingTextUtil::GetAnchorPosFromSelection(
-     const std::string &surrounding_text, const std::string &selected_text,
--    uint cursor_pos, uint *anchor_pos) {
-+    unsigned cursor_pos, unsigned *anchor_pos) {
-   DCHECK(anchor_pos);
- 
-   if (surrounding_text.empty()) {
-@@ -187,13 +187,13 @@ bool GetSurroundingText(InputContext *ic
-   }
- 
-   const auto surrounding_text = ic->surroundingText().text();
--  uint cursor_pos = ic->surroundingText().cursor();
--  uint anchor_pos = ic->surroundingText().anchor();
-+  unsigned cursor_pos = ic->surroundingText().cursor();
-+  unsigned anchor_pos = ic->surroundingText().anchor();
- 
-   if (cursor_pos == anchor_pos && clipboard) {
-     std::string primary = clipboard->call<IClipboard::primary>(ic);
-     if (!primary.empty()) {
--      uint new_anchor_pos = 0;
-+      unsigned new_anchor_pos = 0;
-       if (SurroundingTextUtil::GetAnchorPosFromSelection(
-               surrounding_text, primary, cursor_pos, &new_anchor_pos)) {
-         anchor_pos = new_anchor_pos;
---- a/mozc/src/unix/fcitx5/surrounding_text_util.h
-+++ b/mozc/src/unix/fcitx5/surrounding_text_util.h
-@@ -56,7 +56,7 @@ class SurroundingTextUtil {
-   // Returns true when neither |abs(delta)| nor |-delta| does not cause
-   // integer overflow, that is, |delta| is in a safe range.
-   // Returns false otherwise.
--  static bool GetSafeDelta(uint from, uint to, int32 *delta);
-+  static bool GetSafeDelta(unsigned from, unsigned to, int32 *delta);
- 
-   // Returns true if
-   // 1. |surrounding_text| contains |selected_text|
-@@ -71,7 +71,7 @@ class SurroundingTextUtil {
-   // Otherwise returns false.
-   static bool GetAnchorPosFromSelection(const std::string &surrounding_text,
-                                         const std::string &selected_text,
--                                        uint cursor_pos, uint *anchor_pos);
-+                                        unsigned cursor_pos, unsigned *anchor_pos);
- 
-  private:
-   DISALLOW_IMPLICIT_CONSTRUCTORS(SurroundingTextUtil);
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index c352959b9f58..2c279fc35f57 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -1,9 +1,10 @@
 # Template file for 'mozc'
 pkgname=mozc
 # src/data/version/mozc_version_template.bzl
-version=2.26.4416.102
+# revision is always 102, template always says 100 ;)
+version=2.26.4472.102
 revision=1
-_commit=86b2623896042dd6e123371fb582314c6988888b
+_commit=439a610ac6b6a92375b4a8188d6c9ef45ea591dd
 _abseil=20210324.1
 create_wrksrc=yes
 build_wrksrc=mozc/src
@@ -13,7 +14,7 @@ makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel
  fcitx-devel libfcitx5-devel"
 depends="tegaki-zinnia-japanese>=0.3 mozc-base-${version}_${revision}"
 short_desc="Japanese IME (Open Source version of Google Japanese Input)"
-maintainer="Matthias von Faber <mvf@gmx.eu>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/mozc"
 distfiles="
@@ -22,7 +23,7 @@ distfiles="
  ${DEBIAN_SITE}/main/g/gyp/gyp_0.1+20200513gitcaa6002.orig.tar.gz
  https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz
 "
-checksum="68614d1283e52b3d7035f76e587ed057a3292d6dc25d61100122dc0fd8942c15
+checksum="1c04e8548a15d88710c9e4469d21b13ea05d62ffda6be7859837503895b5a39b
  441db7c09a0565376ecacf0085b2d4c2bbedde6115d7773551bc116212c2a8d6
  8d531bc7d3302461d76a32367453cec60ed08b455f27a53d8f313d81761713a8
  0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1"

From 6d8759fce7369291686d29e6add7e01ce6b8d36d Mon Sep 17 00:00:00 2001
From: Bitmeise <ameise@bitparlament.de>
Date: Thu, 19 Aug 2021 22:50:31 +0200
Subject: [PATCH 787/904] astroid: update to 0.16

---
 srcpkgs/astroid/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index e37e50c628fe..e5095cbaf5f2 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,19 +1,25 @@
 # Template file for 'astroid'
 pkgname=astroid
-version=0.15
-revision=8
+version=0.16
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
 makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
  gmime3-devel boost-devel protobuf-devel vte3-devel gobject-introspection
  libpeas-devel libsoup-devel"
+checkdepends="gnupg notmuch w3m cmark xvfb-run"
 short_desc="Graphical threads-with-tags style email client for Notmuch"
 maintainer="Ameise <ameise@bitparlament.de>"
 license="GPL-3.0-or-later"
 homepage="http://astroidmail.github.io/"
 distfiles="https://github.com/astroidmail/astroid/archive/v${version}.tar.gz"
-checksum=8581bbdbc71bd00d4cdd473cfad8bc604628bb15616fe5eab5c623461f686c65
+checksum=32ecb8c2fafe67f70c7d5f2bc60bda1796d98a56a75f7868c7c1ca50cd7baf5e
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qemu-user-static prelink-cross"
 fi
+
+do_check() {
+	cd build
+	xvfb-run ctest
+}

From 60b79f721c88e95a541d786a54d3d45c8fcf4a71 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 20 Aug 2021 20:52:24 +0200
Subject: [PATCH 788/904] isl: update to 0.24

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

diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index d8a3cbe082a1..397221fbaa41 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -1,6 +1,6 @@
 # Template file for 'isl'
 pkgname=isl
-version=0.23
+version=0.24
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://isl.gforge.inria.fr"
 distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2"
-checksum=c58922c14ae7d0791a77932f377840890f19bc486b653fa64eba7f1026fb214d
+checksum=fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS="-I${XBPS_MASTERDIR}/usr/include"

From e3d617e4d1e80a478f2e711823f4bd2d1e1cd622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linh=20Nguy=E1=BB=85n?= <linhvng.2212@gmail.com>
Date: Thu, 19 Aug 2021 02:13:25 -0400
Subject: [PATCH 789/904] kdenlive: update to 21.08.0

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

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..9f53c3f371fd 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -8,7 +8,7 @@ hostmakedepends="
  qt5-host-tools qt5-qmake gettext"
 makedepends="
  kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel
- kplotting-devel mlt-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
+ kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
  v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel"
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=754fae49644afbc8ecc0f5a4d579f09738f189a7626c99f862e5e4cdb6426df1
+checksum=e441df27deab64cb342f4b1b874313f149950d4baada12f074ad833aa996ce22
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From ac8a4f4f4bf422ffda6c381f78cdb1133c8798f6 Mon Sep 17 00:00:00 2001
From: meator <Coder64@protonmail.com>
Date: Thu, 19 Aug 2021 15:37:31 +0200
Subject: [PATCH 790/904] Manual.md: document changelog and modify homepage

---
 Manual.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index 4316363f66c4..33706f20c210 100644
--- a/Manual.md
+++ b/Manual.md
@@ -434,7 +434,7 @@ in this directory such as `${XBPS_BUILDDIR}/${wrksrc}`.
 
 The list of mandatory variables for a template:
 
-- `homepage` A string pointing to the `upstream` homepage.
+- `homepage` An URL pointing to the upstream homepage.
 
 
 - <a id="var_license"></a>
@@ -743,6 +743,8 @@ used.
 
 - `fetch_cmd` Executable to be used to fetch URLs in `distfiles` during the `do_fetch` phase.
 
+- `changelog` An URL pointing to the upstream changelog. Raw text files are preferred.
+
 - `archs` Whitespace separated list of architectures that a package can be
 built for, available architectures can be found under `common/cross-profiles`.
 In general, `archs` should only be set if the upstream software explicitly targets

From c44d27fe644de62c81f784260eb48838dce0a87f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sun, 22 Aug 2021 16:04:59 +0200
Subject: [PATCH 791/904] Clight: update to 4.7

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

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 20427ef4d666..e8acf81bca2e 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,6 +1,6 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.6
+version=4.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clight"
 distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz"
-checksum=4b5b8d7716ce150d8956f3e741bd56c876eedba41bf391fe484d97de239b76a7
+checksum=a4fc09f118eaa79d5fe9d5f19a2adc323b6401ece7f074e34cb577eec2121833
 
 post_install() {
 	vcompletion Extra/completions/_clight zsh

From 8db052c0b72af1ab7363dec0db40cd5066e2f8ee Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Sat, 21 Aug 2021 10:51:07 -0600
Subject: [PATCH 792/904] mu4e: update to 1.6.4

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

diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
index b27460c9cabe..0fd5788d08e7 100644
--- a/srcpkgs/mu4e/template
+++ b/srcpkgs/mu4e/template
@@ -1,6 +1,6 @@
 # Template file for 'mu4e'
 pkgname=mu4e
-version=1.6.3
+version=1.6.4
 revision=1
 wrksrc="mu-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+checksum=52c954a3dbd0deacd2ab0c2b1f789fd74ad0b96bcef162b69cce47d4de6e37eb
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"
 

From a6a26b659cedae2a4dce55f45557aa1940a51fd2 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Sat, 21 Aug 2021 09:48:12 +1000
Subject: [PATCH 793/904] maxcso: update to 1.13.0

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

diff --git a/srcpkgs/maxcso/template b/srcpkgs/maxcso/template
index 87e35a5d58d2..d7810691128c 100644
--- a/srcpkgs/maxcso/template
+++ b/srcpkgs/maxcso/template
@@ -1,6 +1,6 @@
 # Template file for 'maxcso'
 pkgname=maxcso
-version=1.12.0
+version=1.13.0
 revision=1
 build_style=gnu-makefile
 makedepends="libuv-devel liblz4-devel zlib-devel"
@@ -8,8 +8,8 @@ short_desc="Fast CSO compression/decompression tool"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="ISC"
 homepage="https://github.com/unknownbrackets/maxcso"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e55b3ff8da6337f23da0fd2c51ee31571aba536b18b0039b9353b61b6fec7cb3
+distfiles="https://github.com/unknownbrackets/maxcso/archive/v${version}.tar.gz"
+checksum=af9c05add1a1d199ec184d3471081af1b91d591b2473800ea989c882fb632730
 
 post_install() {
 	vdoc README.md

From e83aff1e4951a304559cfd9994f94568bac03025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 20 Aug 2021 23:48:15 +0200
Subject: [PATCH 794/904] dnscrypt-proxy: update to 2.1.0.

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

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..184f172f6936 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,9 +1,9 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
-version=2.0.45
-revision=2
+version=2.1.0
+revision=1
 build_style=go
-go_import_path=github.com/DNSCrypt/dnscrypt-proxy
+go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
 short_desc="DNS proxy that encrypts queries"
 maintainer="Lugubris <lugubris@disroot.org>"
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://github.com/DNSCrypt/dnscrypt-proxy"
 changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog"
 distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=f7aac28c6a60404683d436072b89d18ed3bb309f8d8a95c8e87ad250da190821
+checksum=4af43a2143a1d0f9b430f5f08981417cb4475cc590daf79d11c9a0487f72fadc
 conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"

From ada0eae62807b4e6e39a1635b8c1c0a6b7dc8f6e Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 21 Aug 2021 22:05:29 +0530
Subject: [PATCH 795/904] certbot: update to 1.18.0.

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

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index b609190fac00..a85371a05a95 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.17.0
+version=1.18.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
-checksum=ef410a1018f4f1ee775961527c00c4f2e2003428cfc4e09eddd5a1834dbfd173
+checksum=f3e56e18246ba5dc4951132e206844f7191d7b6a97264a005557fff25cd7287b

From b7aa933adab5fcf04cd4ac75ba3734939572eacf Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 21 Aug 2021 22:05:32 +0530
Subject: [PATCH 796/904] certbot-nginx: update to 1.18.0.

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

diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index ba0e8b9e56c8..67267c72d1cd 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-nginx'
 pkgname=certbot-nginx
-version=1.17.0
+version=1.18.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-nginx/certbot-nginx-${version}.tar.gz"
-checksum=4d77b220f4cd7d04580cf187e23952f4d54f67bc390227161e0c543de4b7b3c3
+checksum=38341b54c43dc689b67427ccf6df3e3219e4ead5a0b599fc01de883d2762cdaa

From cfe0b66c456a3cf973ec5bdb89af9881db9a21d2 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 21 Aug 2021 22:05:35 +0530
Subject: [PATCH 797/904] certbot-apache: update to 1.18.0.

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

diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index 6e876c32dc4a..f5d1d2d8be58 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-apache'
 pkgname=certbot-apache
-version=1.17.0
+version=1.18.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik S. <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-apache/certbot-apache-${version}.tar.gz"
-checksum=20a18c28a02138b5c15d5434b230cc102049c0753c0e0caf90fb45c507e02bf2
+checksum=df0a8102f7417598e1a4b28ff5434cbfeccfc4ec5ddebb51bd097bd525fcfb3d

From 46979d0939b9052ce630b4ccd651ea8baafb5a63 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 21 Aug 2021 22:11:50 +0530
Subject: [PATCH 798/904] python3-acme: update to 1.18.0.

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

diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 0eccc6dd4065..1a6ded5e95cd 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
-version=1.17.0
+version=1.18.0
 revision=1
 wrksrc="acme-${version}"
 build_style=python3-module
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/certbot"
 distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=2af48e40679103212532cb3d220df444207e5e7b532e0ccebe7773792e0f320e
+checksum=9ae06031bbcc492d4ea20aec36bb2ead08b40ccb70d980ade8ecfe8a15d762af

From 0b3e09c32c7ba598d7b5567c96ec4607a2b2ea7e Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 23 Aug 2021 20:28:35 +0300
Subject: [PATCH 799/904] gitui: update to 0.17.

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

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 1ea290dcb602..6f90cd8666ae 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,6 +1,6 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.16.1
+version=0.17
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -9,8 +9,9 @@ short_desc="Blazing fast terminal-ui for git"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/extrawurst/gitui"
+changelog="https://github.com/extrawurst/gitui/blob/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
-checksum=84fd4c1c004301a12b8f96f3f9218cda5a1263e8bab8480d3857553562a057f2
+checksum=4f81b6bc29046ad4a92a5ee9040f68a02debe93529abad78d806e4eaa35a17ff
 
 post_install() {
 	vlicense LICENSE.md

From 8b4d923cd95c5976e5046e8129e15b0fcf102d80 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Sun, 22 Aug 2021 13:40:24 +0100
Subject: [PATCH 800/904] i3status-rust: update to 0.20.4.

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

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..35604b2a45e0 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
+version=0.20.4
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=613d5ec876c0be8371b1037ddbf777b904bd84f57334b532454e4c430bdbd48f
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 0dcb6a3972d8eafbd8b7f9592c1fefc0e04af5dd Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 22 Aug 2021 17:54:36 +0200
Subject: [PATCH 801/904] haskell-language-server: update to 1.3.0

---
 srcpkgs/haskell-language-server/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 7afa89c452f7..ff0782a54ddb 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,10 +1,7 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.0.0
-revision=2
-# GHC only panics on i686
-# https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
-archs="~i686"
+version=1.3.0
+revision=1
 build_style="haskell-stack"
 make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
@@ -13,7 +10,7 @@ maintainer="Wayne Van Son <waynevanson@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum="14e28d6621d029f027fae44bc4a4ef62c869dab24ff01b88a2e51e6679cbff6c"
+checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 45f65c5d0d81432a39608d31eb11a658b35983f4 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Sun, 22 Aug 2021 20:24:19 +0200
Subject: [PATCH 802/904] vscode: update to 1.59.1

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..a5cb2b02b284 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,8 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.59.1
 revision=1
-_electronver=12.0.9
+_electronver=12.0.14
 hostmakedepends="pkg-config python nodejs yarn tar git"
 makedepends="libxkbfile-devel libsecret-devel electron12"
 depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron12"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=23f8afe92af300447274680cd02128005fa553d0b6228a62ca9f8f95af47d79e
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"

From e38d2610d7e8ec577a031e8f9af3a10d7d89122f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 24 Aug 2021 15:34:57 +0200
Subject: [PATCH 803/904] plocate: update to 1.1.10.

---
 srcpkgs/plocate/patches/include.patch | 10 ----------
 srcpkgs/plocate/patches/musl.patch    | 21 ---------------------
 srcpkgs/plocate/template              |  4 ++--
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/plocate/patches/include.patch
 delete mode 100644 srcpkgs/plocate/patches/musl.patch

diff --git a/srcpkgs/plocate/patches/include.patch b/srcpkgs/plocate/patches/include.patch
deleted file mode 100644
index 2ba06abf287d..000000000000
--- a/srcpkgs/plocate/patches/include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/plocate.cpp.orig
-+++ b/plocate.cpp
-@@ -31,6 +31,7 @@
- #include <string.h>
- #include <string>
- #include <string_view>
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <thread>
diff --git a/srcpkgs/plocate/patches/musl.patch b/srcpkgs/plocate/patches/musl.patch
deleted file mode 100644
index a75e18b4ce1c..000000000000
--- a/srcpkgs/plocate/patches/musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/conf.cpp
-+++ b/conf.cpp
-@@ -479,7 +479,7 @@
- 			if (conf_scan_root != NULL)
- 				error(EXIT_FAILURE, 0, _("--%s specified twice"),
- 				      "database-root");
--			conf_scan_root = canonicalize_file_name(optarg);
-+			conf_scan_root = realpath(optarg, NULL);
- 			if (conf_scan_root == NULL)
- 				error(EXIT_FAILURE, errno, _("invalid value `%s' of --%s"), optarg,
- 				      "database-root");
---- a/database-builder.h
-+++ b/database-builder.h
-@@ -3,6 +3,7 @@
- 
- #include "db.h"
- 
-+#include <unistd.h>
- #include <chrono>
- #include <fcntl.h>
- #include <memory>
diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 9fe873cba5a6..cdb6d5f10f1d 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,6 +1,6 @@
 # Template file for 'plocate'
 pkgname=plocate
-version=1.1.9
+version=1.1.10
 revision=1
 build_style=meson
 configure_args="
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://plocate.sesse.net/"
 changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=0df2bee9921ca74dd2587222d1d9a3b61d561252c9316d3667d2bd0b697798c8
+checksum=812b1128f8f12e2645ca6f647bb67b07408ee065bff1cd58b53341fb15bf4dd4
 
 system_accounts="_plocate"
 

From 04d1b656fe8883ca377e1cbeceb448139e5d15b9 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 15:48:16 +0200
Subject: [PATCH 804/904] vagrant: update to 2.2.18.

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

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 1b335500c48d..1ac10dc90d8f 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,6 +1,6 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.2.17
+version=2.2.18
 revision=1
 archs="i686 x86_64*"
 hostmakedepends="ruby"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://www.vagrantup.com/"
 distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz"
-checksum=4f8f2e8bb8e0abd9e2de90b4f497765b3913f4f05a27e4940df71703940c8ccf
+checksum=3508b0906b832d7317c8d36220798ec274b721e7ef63d0cf991c68f19d9dae90
 nocross=yes
 
 post_extract() {

From cd03f00fe4956b8d4553e1a5c74e8a38d948856e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 15:49:28 +0200
Subject: [PATCH 805/904] kubernetes: update to 1.22.1.

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

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..d8489fdbab57 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.22.1
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=94ec93dc497381170eab6ac74611f4e74fee770565b68f77ad6433eff12ca051
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From c7bbf0b9b3ed2d6e3d011d458e29ce7dff5950dc Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 16:03:43 +0200
Subject: [PATCH 806/904] python-b2sdk: update to 1.12.0.

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

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index f0a8aec07813..206681516c03 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,11 +1,11 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.4.0
+version=1.12.0
 revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+hostmakedepends="python3-setuptools_scm python3-pip"
 depends="python3-logfury python3-Arrow python3-requests python3-six"
 checkdepends="python3-pytest $depends python3-dateutil python3-nose
  python3-mock python3-tqdm python3-pyflakes"
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=fb82cbaef5dd7499b62622010fc8e328944ca8cbdd00b485530ab6600de1129d
+checksum=3ec2264ae2b421563d130a4b2a53f96454ba03b8f68893ad520fc651c413251d
 
 post_install() {
 	vlicense LICENSE

From 1a042018c354afc9b9a648c28f02c18d5e8cda22 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 16:13:35 +0200
Subject: [PATCH 807/904] texmaker: update to 5.1.1.

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

diff --git a/srcpkgs/texmaker/template b/srcpkgs/texmaker/template
index bd07f0b84ce0..cbb8184a16a7 100644
--- a/srcpkgs/texmaker/template
+++ b/srcpkgs/texmaker/template
@@ -1,13 +1,13 @@
 # Template file for 'texmaker'
 pkgname=texmaker
-version=5.0.4
+version=5.1.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
-makedepends="poppler-qt5-devel qt5-webkit-devel qt5-script-devel"
+makedepends="poppler-qt5-devel qt5-webkit-devel qt5-script-devel qt5-declarative-devel"
 short_desc="Free cross-platform LaTeX editor"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://www.xm1math.net/texmaker/index.html"
 distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2"
-checksum=1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2
+checksum=80034992749620c37e074b803ad3e297c11b8f25ade04fb13b13ac791f3b0dde

From 29d61119b857b9814153b0d73704543d063ab386 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 16:23:03 +0200
Subject: [PATCH 808/904] flannel: update to 0.14.0.

---
 srcpkgs/flannel/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index bdce9f5955ed..a3687a26ad7f 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,6 +1,6 @@
 # Template file for 'flannel'
 pkgname=flannel
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=go
 short_desc="Etcd backed network fabric for containers"
@@ -10,7 +10,11 @@ license="Apache-2.0"
 go_import_path="github.com/coreos/flannel"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v${version}.tar.gz"
-checksum=ee519c58d1d1f3cc8e3ab2e21a6e30a024de16927961fe678a5453e70c16f557
+checksum=e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca
+
+post_extract() {
+	ln -s $wrksrc vendor/$go_import_path
+}
 
 post_install() {
 	vsv flannel

From e61be1fc525cd1a6101b56c176cfb20792ee65c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Aug 2021 16:13:17 +0200
Subject: [PATCH 809/904] python3-pyinfra: update to 1.4.13.

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

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..7d07a8aba9e7 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.13
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=631ceaffcbb4fb68bd90559842b5c4ca9918287eef559fe2ee8d817c98bada01
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 957308f149519aa98a19104fef90eb202099cc2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Aug 2021 16:27:25 +0200
Subject: [PATCH 810/904] kismet: update to 2021.08.R1.

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

diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index 3497233f5bf5..6d8a4524beeb 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,6 +1,6 @@
 # Template file for 'kismet'
 pkgname=kismet
-version=2021.06.R1
+version=2021.08.R1
 revision=1
 _realver="${version//./-}"
 wrksrc="${pkgname}-${_realver}"
@@ -17,5 +17,5 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kismetwireless.net/"
 distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz"
-checksum=f85939c9d32fa72d777db35c68af84c379171b94380acad0db7924f95a81bdaa
+checksum=1c8e31b1babdb0fc93ac38fd0772a24d4b40f865fbc292fa8ec7f4a18ced0135
 system_groups="kismet"

From 1a1fccaec6f40832444cb6eeeddfed6791a63c2f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 16:32:59 +0200
Subject: [PATCH 811/904] gede: update to 2.18.1.

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

diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template
index 5cb8bbcec9d4..00edce27b05f 100644
--- a/srcpkgs/gede/template
+++ b/srcpkgs/gede/template
@@ -1,21 +1,21 @@
 # Template file for 'gede'
 pkgname=gede
-version=2.16.2
+version=2.18.1
 revision=1
 build_wrksrc=src
 build_style=qmake
-hostmakedepends="python qt5-qmake qt5-host-tools"
+hostmakedepends="python3 qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="gdb ctags"
 short_desc="Graphical frontend (GUI) to GDB written in Qt"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
 homepage="http://acidron.com/gede"
-distfiles="http://gede.acidron.com/uploads/source/${pkgname}-${version}.tar.xz"
-checksum=32c390099d9755ec54836a04ef82ffcd315bd6912525714f626b3eb87db248a1
+distfiles="http://gede.dexar.se/uploads/source/${pkgname}-${version}.tar.xz"
+checksum=8883f8418062a3046cf6f8e017bdc954a2a57bc7fb8a0d9ec5a229d7ea33469d
 
 do_install() {
 	cd $wrksrc
-	python2 build.py install --prefix="${PKGDESTDIR}/usr" install
+	python3 build.py install --prefix="${PKGDESTDIR}/usr" install
 	vlicense LICENSE
 }

From e74dc69e6e4095d9398ccd2bcf3cf58aa77432aa Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 16:46:43 +0200
Subject: [PATCH 812/904] pinktrace: update to 1.0.0.

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

diff --git a/common/shlibs b/common/shlibs
index b5363014957e..1723c8ed88da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2428,7 +2428,7 @@ libgflags_nothreads.so.2.2 gflags-2.1.2_1
 libswmhack.so.0.0 spectrwm-2.7.2_1
 libchardet.so.1 libchardet-1.0.4_1
 libcollectdclient.so.1 libcollectdclient-5.12.0_3
-libpinktrace_0.9.so.9 pinktrace-0.9.1_1
+libpinktrace_1.0.so.100 pinktrace-1.0.0_1
 libsyd_1.0.so.0 sydbox-1.0.2_1
 libcsync.so.0 csync-0.50.0_1
 libcalligrasheetsodf.so.17 calligra-sheets-3.2.0_1
diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index 3fbb5a48a58a..49852488a0b3 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -1,6 +1,6 @@
 # Template file for 'pinktrace'
 pkgname=pinktrace
-version=0.9.6
+version=1.0.0
 revision=1
 # arch list taken from https://dev.exherbo.org/~alip/pinktrace/#supported_platforms
 archs="x86_64* i686* ppc* arm*"
@@ -15,14 +15,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="http://dev.exherbo.org/~alip/pinktrace/"
 distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=5d2670607f70da397c6da06fbb1844020b44b63c8aea8a725771aac02235b27a
+checksum=a963359c3a66d31f8ac5b75cdc41ff0c4886df48609338771a2016c712b2f48a
 
 pre_configure() {
 	./autogen.sh
 }
 
 post_install() {
-	vlicense COPYRIGHT
+	vlicense COPYING
 }
 
 pinktrace-devel_package() {

From 34753b17016459aca3be5f9f707ae8cbd9a80542 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 16:51:03 +0200
Subject: [PATCH 813/904] sydbox: update to 1.2.1.

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

diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index ffaabf73d2de..1fdeffa9d69b 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,6 +1,6 @@
 # Template file for 'sydbox'
 pkgname=sydbox
-version=1.1.0
+version=1.2.1
 revision=1
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
 distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=765fd5ce4b3a48270c7ea7b8b3d0dbf43f103ce0214c1ae7126579310f571bd2
+checksum=50a17c3639ec46ce1c9a70844b6e01888264e396d5da607aab2f20a1f204ca04
 python_version=2 #unverified
 
 # seccomp only implemented on x86
@@ -24,7 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	vlicense COPYRIGHT
+	vlicense COPYING
 }
 
 sydbox-devel_package() {

From db0c27b891f64603ee1c14f7d0f3517db047ddfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 23 Aug 2021 20:24:09 -0400
Subject: [PATCH 814/904] libnma: update to 1.8.32

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

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index bd4d9fb2ad79..88ac261d74db 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,7 +1,7 @@
 # Template file for 'libnma'
 pkgname=libnma
-version=1.8.30
-revision=3
+version=1.8.32
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
@@ -12,8 +12,9 @@ short_desc="NetworkManager panel applet for GNOME - runtime library"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libnma"
+changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4
+checksum=0a57b93a2fad43acc763f320dd3a7a93c429b0e3118dfa549d67824cddc4e905
 replaces="libnm-gtk>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 47469b022745098e25ad711a1616169d4aa86030 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Aug 2021 20:35:04 +0200
Subject: [PATCH 815/904] sydbox: explicitly disable seccomp where unsupported

---
 srcpkgs/sydbox/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index 1fdeffa9d69b..36f39ef0eb89 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -14,9 +14,12 @@ distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.ta
 checksum=50a17c3639ec46ce1c9a70844b6e01888264e396d5da607aab2f20a1f204ca04
 python_version=2 #unverified
 
-# seccomp only implemented on x86
+# https://github.com/sydbox/pinktrace/blob/main/pinktrace/abi.h
+# implemented for x86_64 and i386 in sydbox, but pinktrace does
+# not seem to have i386, so only enable for x86_64
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*) configure_args+=" --enable-seccomp" ;;
+	x86_64*) configure_args+=" --enable-seccomp" ;;
+	*) configure_args+=" --disable-seccomp" ;;
 esac
 
 pre_configure() {

From 4b2025cee6b9d195d4ea4b56587f57b0e6926f2c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Aug 2021 20:38:02 +0200
Subject: [PATCH 816/904] pinktrace: disable on arm, enable on aarch64

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

diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index 49852488a0b3..061089c07830 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -3,7 +3,7 @@ pkgname=pinktrace
 version=1.0.0
 revision=1
 # arch list taken from https://dev.exherbo.org/~alip/pinktrace/#supported_platforms
-archs="x86_64* i686* ppc* arm*"
+archs="x86_64* aarch64* i686* ppc*"
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
 configure_args="--enable-python"

From 22d39e808f585d5add943a4ef1705c23d8458a55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 23 Aug 2021 19:59:22 +0200
Subject: [PATCH 817/904] gdm: update to 40.1.

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index c76e13c2de12..81d0b3f5e19a 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=40.0
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
+checksum=abb8a1ea664848f2c90f84acaa42e94d256057035881a98fbd41fbc5d7d173fd
 
 conf_files="
 	/etc/gdm/custom.conf
@@ -31,7 +31,6 @@ conf_files="
 	/etc/pam.d/gdm-fingerprint
 	/etc/pam.d/gdm-launch-environment
 	/etc/pam.d/gdm-password
-	/etc/pam.d/gdm-pin
 	/etc/pam.d/gdm-smartcard"
 # Create the 'gdm' system user/group.
 system_accounts="gdm"

From bd1280daf6f17b62cb306bb84c7c1455975635f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 23 Aug 2021 19:59:29 +0200
Subject: [PATCH 818/904] mutter: update to 40.4.

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

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 952bf115cdf3..02e5fad9a2c6 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=40.3
+version=40.4
 revision=1
 build_helper="gir"
 build_style=meson
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5b15cf8f41da281424bb381ddcd0defc2e17b944b552f77df2fac5e2b34cb005
+checksum=a71c159cd2ac84a677da5fa7acc49483b2627dad772f880f889eb8e4530a1e23
 shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
  libmutter-cogl-pango-8.so"
 make_check=no # needs a full graphical session

From 95e7943b9d571ebda4898278bf2d53dcaad847d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 23 Aug 2021 19:59:32 +0200
Subject: [PATCH 819/904] gnome-shell: update to 40.4.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..255cc51ee856 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.4
 revision=1
 build_style=meson
 build_helper=gir
@@ -22,7 +22,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+checksum=2bc5919305652b3c95ec42c67193512bd10cf6544f684694d1b9e229fe421f98
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 843dc20033ae2df4d62c34aec375a3f0617c4779 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 23 Aug 2021 19:59:36 +0200
Subject: [PATCH 820/904] gnome-shell-extensions: update to 40.4.

---
 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 431ac5b9777c..96e7c29dd22d 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=40.3
+version=40.4
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=f51d4c42c22bbbd0312ca718f47cf4569fc58a46ef400743ae4d1cc7d90acd79

From 6ca30fd0267cc38eccd5a7c92cd0b7225fd1282e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 23 Aug 2021 19:59:43 +0200
Subject: [PATCH 821/904] gnome-desktop: update to 40.4.

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..f046c065956b 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.4
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=88ae96f585e0d0870941bba3d75ddf3ec40348e1c5ae741321ca482fac9d45ef
 
 build_options="gir"
 build_options_default="gir"

From 84d849ddc40e12f7ef93e7477d7530fc4daabad1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 20 Aug 2021 00:33:38 +0200
Subject: [PATCH 822/904] New package: python3-charset-normalizer-2.0.4

---
 srcpkgs/python3-charset-normalizer/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-charset-normalizer/template

diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
new file mode 100644
index 000000000000..c7d212d8cf1d
--- /dev/null
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-charset-normalizer'
+pkgname=python3-charset-normalizer
+version=2.0.4
+revision=1
+wrksrc="charset_normalizer-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Encoding and language detection"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="MIT"
+homepage="https://charset-normalizer.readthedocs.io/"
+distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
+checksum=3fcde2e1c62bb86ed8e20ce03127ffa5ac09a3e2f2c69cc273834ed6d3e94205
+
+post_install() {
+	vlicense LICENSE
+}

From a5780e99ada849a29567cffeb4bd2d91424b8b4b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 22 Aug 2021 22:01:17 +0200
Subject: [PATCH 823/904] python-idna: split python3-idna to a separate package

idna v3 doesn't support python2 anymore, so let's move with the python3
variant and leave the python2 variant on v2
---
 srcpkgs/python-idna/template  | 13 ++-----------
 srcpkgs/python3-idna          |  1 -
 srcpkgs/python3-idna/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/python3-idna
 create mode 100644 srcpkgs/python3-idna/template

diff --git a/srcpkgs/python-idna/template b/srcpkgs/python-idna/template
index 5ecad795c9db..05101f64b883 100644
--- a/srcpkgs/python-idna/template
+++ b/srcpkgs/python-idna/template
@@ -3,8 +3,8 @@ pkgname=python-idna
 version=2.10
 revision=1
 wrksrc="idna-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
 short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -17,12 +17,3 @@ checksum=b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6
 post_install() {
 	vlicense LICENSE.rst
 }
-
-python3-idna_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-idna b/srcpkgs/python3-idna
deleted file mode 120000
index a7670f279131..000000000000
--- a/srcpkgs/python3-idna
+++ /dev/null
@@ -1 +0,0 @@
-python-idna
\ No newline at end of file
diff --git a/srcpkgs/python3-idna/template b/srcpkgs/python3-idna/template
new file mode 100644
index 000000000000..29f49107e2f3
--- /dev/null
+++ b/srcpkgs/python3-idna/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-idna'
+pkgname=python3-idna
+version=3.2
+revision=1
+wrksrc="idna-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Internationalized Domain Names in Applications (IDNA) for Python3"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/kjd/idna"
+changelog="https://raw.githubusercontent.com/kjd/idna/master/HISTORY.rst"
+distfiles="${PYPI_SITE}/i/idna/idna-${version}.tar.gz"
+checksum=467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3
+
+post_install() {
+	vlicense LICENSE.md
+}

From 32ef32af5f65b8c53044a2108da2b9e19575a9c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Jul 2021 22:37:52 +0200
Subject: [PATCH 824/904] python-requests: update to 2.26.0.

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

diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template
index bde0b03b9ef9..ab2e1eb27067 100644
--- a/srcpkgs/python-requests/template
+++ b/srcpkgs/python-requests/template
@@ -1,6 +1,6 @@
 # Template file for 'python-requests'
 pkgname=python-requests
-version=2.25.1
+version=2.26.0
 revision=1
 wrksrc="requests-${version}"
 build_style=python-module
@@ -12,14 +12,15 @@ license="Apache-2.0"
 homepage="https://python-requests.org/"
 changelog="https://raw.githubusercontent.com/psf/requests/master/HISTORY.md"
 distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz"
-checksum=27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804
+checksum=b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7
+make_check=no # tests are broken for python2 requests
 
 post_patch() {
 	vsed -i '/certifi/d' setup.py
 }
 
 python3-requests_package() {
-	depends="ca-certificates python3-chardet python3-urllib3 python3-idna"
+	depends="ca-certificates python3-charset-normalizer python3-urllib3 python3-idna"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From ef43886996de8195afa7d371d36c947b9e4fcc6e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Jul 2021 12:36:05 +0200
Subject: [PATCH 825/904] docker-compose: remove python3-websocket-client
 dependency

they don't use websocket-client since 2014, but they still list it in
dependencies: https://github.com/docker/compose/issues/8455
---
 srcpkgs/docker-compose/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index c5fcdb65a0ac..e447d00c79f7 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,21 +1,21 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=1.27.4
-revision=2
+revision=3
 wrksrc="compose-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-docker>=3.7.0
- python3-dockerpty python3-websocket-client python3-requests python3-docopt
- python3-yaml python3-six python3-texttable python3-cached-property
- python3-paramiko>=2.4.2 python3-dotenv python3-distro"
+ python3-dockerpty python3-requests python3-docopt python3-yaml python3-six
+ python3-texttable python3-cached-property python3-paramiko>=2.4.2
+ python3-dotenv python3-distro"
 short_desc="Tool to define and run multi-container Docker applications"
 maintainer="pancake <pancake@nopcode.org>"
 license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 distfiles="https://github.com/docker/compose/archive/${version}.tar.gz"
 checksum=1c0458f37e9de4bf2d79fe82c9ab0065c8a6132496c3c2f477599604e294a422
-
+make_check=no # needs ddt which is not packaged
 
 post_install() {
 	vinstall contrib/completion/bash/docker-compose 644 \

From 79ae2219a88ce99f80cfbdd9c4e8d732230fd480 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 14 Jun 2021 18:16:04 +0200
Subject: [PATCH 826/904] python3-websocket-client: update to 1.2.1.

---
 srcpkgs/python3-websocket-client/template | 27 +++++++----------------
 srcpkgs/python3-websocket-client/update   |  1 -
 2 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/python3-websocket-client/update

diff --git a/srcpkgs/python3-websocket-client/template b/srcpkgs/python3-websocket-client/template
index 248adfbf7616..ecc47dca1e55 100644
--- a/srcpkgs/python3-websocket-client/template
+++ b/srcpkgs/python3-websocket-client/template
@@ -1,29 +1,18 @@
 # Template file for 'python3-websocket-client'
 pkgname=python3-websocket-client
-version=0.57.0
+version=1.2.1
 revision=1
-wrksrc="websocket_client-${version}"
+wrksrc="websocket-client-${version}"
 build_style=python3-module
+make_check_target="websocket/tests"
 hostmakedepends="python3-setuptools"
-depends="python3-six ca-certificates"
-checkdepends="python3-pytest python3-six"
+depends="ca-certificates"
+checkdepends="python3-pytest"
 short_desc="WebSocket client for Python3"
 maintainer="Sergi Alvarez <pancake@nopcode.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://github.com/websocket-client/websocket-client"
 changelog="https://raw.githubusercontent.com/websocket-client/websocket-client/master/ChangeLog"
-distfiles="${PYPI_SITE}/w/websocket-client/websocket_client-${version}.tar.gz"
-checksum=d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010
+distfiles="https://github.com/websocket-client/websocket-client/archive/refs/tags/v$version.tar.gz"
+checksum=8e056ff93c85b1961234d1c36fda8c5277a03f1ba475d93afb8ec46d2a7976de
 alternatives="websocket-client:wsdump:/usr/bin/wsdump.py"
-
-do_check() {
-	python3 -m pytest
-}
-
-pre_build() {
-	vsed -i "s|'backports.ssl_match_hostname'||" setup.py
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-websocket-client/update b/srcpkgs/python3-websocket-client/update
deleted file mode 100644
index 98c17ed0e0b7..000000000000
--- a/srcpkgs/python3-websocket-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=websocket_client

From e5e799c7e74db03d796e40a6bf0d84397bbf38be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 14 Jun 2021 18:15:56 +0200
Subject: [PATCH 827/904] streamlink: update to 2.3.0.

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

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 5b2a5626c20b..ce8ff3f11d86 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=2.0.0
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,7 +15,8 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=c0ead9e961638d41cab9bd9677cdc701f2313bfd4d23cd8158410932839c62db
+checksum=1497e6dc5d2fb8c5b17688f20ca2e8989a279de804a4de37d2107af33b9faa04
+make_check=ci-skip # some tests fail when running as root
 
 export STREAMLINK_USE_PYCOUNTRY=1
 

From 2baf06dcb451eb8a4f13cb7e73523253d9257f76 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 28 Jul 2021 16:35:07 +0200
Subject: [PATCH 828/904] pulseaudio: update to 15.0.

Closes: #32232 [via git-merge-pr]
---
 common/shlibs               |  4 ++--
 srcpkgs/pulseaudio/template | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1723c8ed88da..0ef8dd581524 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -726,8 +726,8 @@ libasyncns.so.0 libasyncns-0.8_1
 libpulse.so.0 libpulseaudio-14.2_2
 libpulse-mainloop-glib.so.0 libpulseaudio-14.2_2
 libpulse-simple.so.0 libpulseaudio-14.2_2
-libpulsecommon-14.2.so libpulseaudio-14.2_2
-libpulsecore-14.2.so libpulseaudio-14.2_2
+libpulsecommon-15.0.so libpulseaudio-15.0_1
+libpulsecore-15.0.so libpulseaudio-15.0_1
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index ebd8d86f63a7..ac2205d76f4b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,20 +1,20 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
-version=14.2
-revision=4
+version=15.0
+revision=1
 build_style=meson
-# XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
- -Dbluez5=true -Dbluez5-ofono-headset=false -Dbluez5-native-headset=true
- -Dudevrulesdir=/usr/lib/udev/rules.d
+ -Dbluez5=enabled -Dbluez5-ofono-headset=false -Dbluez5-native-headset=true
+ -Delogind=enabled -Dudevrulesdir=/usr/lib/udev/rules.d
  -Dbashcompletiondir=/usr/share/bash-completion/completions"
-hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
+hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config
+ doxygen"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
  libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
- webrtc-audio-processing-devel xcb-util-devel check-devel"
+ webrtc-audio-processing-devel xcb-util-devel check-devel elogind-devel"
 depends="pulseaudio-utils>=${version}_${revision} rtkit"
 conf_files="/etc/pulse/*"
 short_desc="Featureful, general-purpose sound server"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
-checksum=75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1
+checksum=a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
 python_version=3
 # FIXME: core-util-test fails
 make_check=yes
@@ -39,6 +39,10 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*) configure_args+=" -Db_lto=false"
+esac
+
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		# Disable neon optimizations for the arm* architectures

From 05d5774cb4e0d34f56f014f96d42398a250cbae3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 24 Aug 2021 21:36:10 -0400
Subject: [PATCH 829/904] steam: update void specific troubleshooting

---
 srcpkgs/steam/files/README.voidlinux | 11 +++++++++--
 srcpkgs/steam/template               |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/steam/files/README.voidlinux b/srcpkgs/steam/files/README.voidlinux
index 35d1fe4798d0..9d18f3525970 100644
--- a/srcpkgs/steam/files/README.voidlinux
+++ b/srcpkgs/steam/files/README.voidlinux
@@ -28,8 +28,15 @@ installed for some games to function.
 If games are running slowly or not at all, or there are issues with network
 streaming, verify that your user belongs to the video group.
 
-If your audio is not working, try installing pulseaudio and
-alsa-plugins-pulseaudio.
+If your audio is not working, try installing pulseaudio,
+alsa-plugins-pulseaudio, and their "<package>-32bit" equivalents.
+
+If you are using SteamPlay/Proton and the game crashes or hangs with error
+messages that include "eventfd: Too many open files", this means
+the number of open file descriptors per process is too low for proper Proton
+functionality.  In this case, consult limits.conf(5) and set a higher nofile
+limit for your user.  Formore information, see the upstream documentation in
+the README.esync file from https://github.com/ValveSoftware/wine.
 
 If you are encountering runtime errors, the Steam Ubuntu bootstrap tarball might
 be using an incompatible libstdc++ library. You can verify this by running the
diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index aa5f8358d300..5594b6a59793 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,7 +1,7 @@
 # Template file for 'steam'
 pkgname=steam
 version=1.0.0.71
-revision=1
+revision=2
 archs="i686 x86_64"
 wrksrc=steam-launcher
 depends="zenity xz curl dbus freetype gdk-pixbuf hicolor-icon-theme desktop-file-utils

From 74867e113ed7cddc8b743cc12d28afb22e786a9f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 25 Aug 2021 12:28:27 +0200
Subject: [PATCH 830/904] monit: update to 5.29.0.

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

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..cc4bc91971f1 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.29.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=f665e6dd1f26a74b5682899a877934167de2b2582e048652ecf036318477885f
 
 pre_configure() {
 	./bootstrap

From b38037ee5119bc9b4a5d79f727c6b221a006b618 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 25 Aug 2021 13:01:43 +0200
Subject: [PATCH 831/904] pulseaudio-module-sndio: rebuild against
 pulseaudio-15.0.

---
 srcpkgs/pulseaudio-module-sndio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pulseaudio-module-sndio/template b/srcpkgs/pulseaudio-module-sndio/template
index 7b261e7ae069..cbe6fd42caaf 100644
--- a/srcpkgs/pulseaudio-module-sndio/template
+++ b/srcpkgs/pulseaudio-module-sndio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio-module-sndio'
 pkgname=pulseaudio-module-sndio
 version=13.0
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pulseaudio pkg-config"

From f25f9cba6e75bfd5562fed49eee8862b271fd0be Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 24 Aug 2021 17:28:44 +0200
Subject: [PATCH 832/904] docker-cli: update to 20.10.8.

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

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 8299aba7846c..4393e5a39acf 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-cli'
 pkgname=docker-cli
-version=20.10.6
-revision=2
+version=20.10.8
+revision=1
 wrksrc="cli-${version}"
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
@@ -12,11 +12,11 @@ go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
 hostmakedepends="pkg-config"
 depends="git"
 short_desc="Command-line interface for the Docker daemon"
-maintainer="PWA COLLECTIVE <pwa@cya.cx>"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=eda53b96ab83a59502df2e5e00ab7ee867243259407ef454be55e695303c1113
+checksum=cde34bbefd70fa27b44dfa904c40db84b89abf237e5267dcd08603b459a89253
 system_groups="docker"
 
 pre_build() {

From 9f8db3da2c2728a5ad475150bae765e2665c8b58 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 25 Aug 2021 07:31:04 +0200
Subject: [PATCH 833/904] kotlin-bin: update to 1.5.30.

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

diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index b028d4993017..a4fbb519756e 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'kotlin-bin'
 pkgname=kotlin-bin
-version=1.5.10
+version=1.5.30
 revision=1
 archs="x86_64"
 wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="Apache-2.0"
 homepage="https://kotlinlang.org/"
 distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=2f8de1d73b816354055ff6a4b974b711c11ad55a68b948ed30b38155706b3c4e
+checksum=25eebdb9bb2e165e4ba8efbf8ff943c45d4fc39dbffc2c1caa059e8dd813675f
 nostrip=yes
 replaces="kotlin>=0"
 

From 0ab33fd6eb04efc3409559d20d7f6d20ff5dd28b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 25 Aug 2021 06:50:00 +0400
Subject: [PATCH 834/904] libcap: update to 2.53.

---
 .../patches/fix-rebuild-during-install.patch  | 47 +++++++++++++++++++
 srcpkgs/libcap/template                       |  4 +-
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libcap/patches/fix-rebuild-during-install.patch

diff --git a/srcpkgs/libcap/patches/fix-rebuild-during-install.patch b/srcpkgs/libcap/patches/fix-rebuild-during-install.patch
new file mode 100644
index 000000000000..bc32d9790675
--- /dev/null
+++ b/srcpkgs/libcap/patches/fix-rebuild-during-install.patch
@@ -0,0 +1,47 @@
+From afbc554d16a32ed352191e49b3673f2f72d0002f Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Tue, 24 Aug 2021 01:22:57 +0200
+Subject: libcap/Makefile: don't overwrite 'empty' when generating loader.txt
+
+objcopy takes an input file and an output file as arguments. If the
+output file is left out, the input file will be overwritten.
+
+Since the objcopy command used to generate loader.txt only does a
+dump-section and no filtering, in practice there is no change to empty.
+However, as a side-effect, its timestamp is updated. The timestamp of
+empty and of loader.txt will be more or less the same; however,
+loader.txt is closed just before the output file is closed, so it's
+possible that the timestamp of loader.txt is just a little bit earlier.
+If this happens, it causes loader.txt to be rebuilt later, which in turn
+causes a number of other object files to be rebuilt.
+
+Usually that's harmless, but it sometimes causes the rebuild to happen
+during 'make install'. This is particularly annoying if 'make install'
+is done as root, since loader.txt becomes owned by root in that case.
+
+Fix this by specifying a harmless output file: /dev/null.
+
+Fixes: ee3b25c0a877fa74d1aec88f325ac45b09963c82
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
+---
+ libcap/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 56fb0af..399aa66 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -108,7 +108,7 @@ empty: empty.c
+ 	$(CC) -o $@ $<
+ 
+ loader.txt: empty
+-	$(OBJCOPY) --dump-section .interp=$@ $<
++	$(OBJCOPY) --dump-section .interp=$@ $< /dev/null
+ 
+ cap_magic.o: execable.h execable.c loader.txt
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..db5625169971 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.53
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=9546b7e5358a67a6a4fb0f51715b628efdeff00ee0e629666847ed7de3c63571
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 67abd2f8a531427be4e8a8d28a4116185674a011 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 25 Aug 2021 06:18:25 +0400
Subject: [PATCH 835/904] python3-regex: update to 2021.8.21.

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

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..72539cd6182d 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.8.21
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=faf08b0341828f6a29b8f7dd94d5cf8cc7c39bfc3e67b78514c54b494b66915a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 197e1009aaf4a329f2a57a868822429a713d6bc1 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 25 Aug 2021 06:10:37 +0400
Subject: [PATCH 836/904] json-glib: update to 1.6.6.

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

diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index 4a3c611826a7..2905530efee4 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'json-glib'
 pkgname=json-glib
-version=1.6.2
+version=1.6.6
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24
+checksum=96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e
 
 # Package build options
 build_options="gir"

From 3247f7210b03e7b3845069296b818b92da459ec4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 24 Aug 2021 23:35:18 -0400
Subject: [PATCH 837/904] discord: update dependencies

xdg-utils to open links in discord
webrtc-audio-processing to avoid discord error that closes after 1 hour
or less into a call
---
 srcpkgs/discord/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/discord/template b/srcpkgs/discord/template
index fc6a70079d8b..7e53659ac788 100644
--- a/srcpkgs/discord/template
+++ b/srcpkgs/discord/template
@@ -1,14 +1,15 @@
 # Template file for 'discord'
 pkgname=discord
 version=0.0.15
-revision=1
+revision=2
 archs="x86_64"
 wrksrc="Discord"
-depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic"
+depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic
+ xdg-utils webrtc-audio-processing"
 short_desc="Chat and VOIP application"
 maintainer="Ryan Conwell <ryanconwell@protonmail.com>"
 license="custom:Proprietary"
-homepage="https://discordapp.com"
+homepage="https://discord.com"
 distfiles="https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"
 checksum=adede954e9c696d96e254759b539527a24ab1d42f0d548c5c4309d1a3fc3c25e
 repository=nonfree

From 78c17335f2bdc79d76649047911e7414a2a54543 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Wed, 25 Aug 2021 11:19:48 -0400
Subject: [PATCH 838/904] synapse: update to 1.41.0.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..f6fc935ba8ef 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.41.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=dcf1144c1818246f49e3ec7e487abde3f1e31fbbab700e8ee5e8ca73a883d5d7
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From e5d9d6f0f613e528dfbd02dc0475a239bb2c3f18 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 25 Aug 2021 09:21:05 +0200
Subject: [PATCH 839/904] slack-desktop: update to 4.19.2

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

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..e96d023b2908 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.19.2
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=aa2ce20f6f724e28ee8b9ceed555902f4ce822ea1bce01bc600706caf3add70a
 restricted=yes
 repository="nonfree"
 nopie=yes

From 77b7ec01f223ab97ac5ee2f904665b68a8194105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 24 Aug 2021 18:37:30 -0300
Subject: [PATCH 840/904] libmpc: update to 1.2.1.

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

diff --git a/srcpkgs/libmpc/template b/srcpkgs/libmpc/template
index ae2f6f480c05..ec0930a6d5aa 100644
--- a/srcpkgs/libmpc/template
+++ b/srcpkgs/libmpc/template
@@ -1,7 +1,7 @@
 # Template file for 'libmpc'
 pkgname=libmpc
-version=1.1.0
-revision=2
+version=1.2.1
+revision=1
 bootstrap=yes
 wrksrc="mpc-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://www.multiprecision.org"
 distfiles="${GNU_SITE}/mpc/mpc-${version}.tar.gz"
-checksum=6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
+checksum=17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS="-I${XBPS_MASTERDIR}/usr/include"

From a63388f94232f1d2b7f6301de7a3bdca900289cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 25 Aug 2021 01:12:03 +0200
Subject: [PATCH 841/904] mpd: update to 0.22.11.

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..e7d50ea115bf 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.11
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=143f7f34aaee6e87888f3dd35d49aade6656052651b960ca42b46cbb518ca0a0
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From ed0f971131cc9b7ed634ddafa35a7776454a23dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 24 Aug 2021 12:09:47 -0300
Subject: [PATCH 842/904] openssl: update to 1.1.1l.

---
 srcpkgs/openssl/patches/ppc-auxv.patch | 16 ++++++++++++----
 srcpkgs/openssl/template               |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
index 308cb2218bc9..274ac2d55998 100644
--- a/srcpkgs/openssl/patches/ppc-auxv.patch
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -1,6 +1,8 @@
---- a/crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
-+++ b/crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
-@@ -207,11 +207,9 @@
+diff --git a/crypto/ppccap.c b/crypto/ppccap.c
+index eeaa47c..e6eeb14 100644
+--- a/crypto/ppccap.c
++++ b/crypto/ppccap.c
+@@ -207,17 +207,9 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
          return 0;
  }
  
@@ -8,10 +10,16 @@
 -# if __GLIBC_PREREQ(2, 16)
 -#  include <sys/auxv.h>
 -#  define OSSL_IMPLEMENT_GETAUXVAL
+-# elif defined(__ANDROID_API__)
+-/* see https://developer.android.google.cn/ndk/guides/cpu-features */
+-#  if __ANDROID_API__ >= 18
+-#   include <sys/auxv.h>
+-#   define OSSL_IMPLEMENT_GETAUXVAL
+-#  endif
 -# endif
 +#if defined(__linux__)
 +# include <sys/auxv.h>
 +# define OSSL_IMPLEMENT_GETAUXVAL
  #endif
  
- /* I wish <sys/auxv.h> was universally available */
+ #if defined(__FreeBSD__)
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 01dfd74de14d..06d83aa0d81d 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'openssl'
 pkgname=openssl
-version=1.1.1k
+version=1.1.1l
 revision=1
 bootstrap=yes
 build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <johnz@posteo.net>"
 license="OpenSSL"
 homepage="https://www.openssl.org"
 distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
+checksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
 conf_files="/etc/ssl/openssl.cnf"
 replaces="libressl>=0"
 

From 92d72e312c204499156e913b3c8dbe33a0b21594 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 24 Aug 2021 10:40:27 +0300
Subject: [PATCH 843/904] help2man: update to 1.48.5.

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

diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..43a37704ab40 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=6739e4caa42e6aed3399be4387ca79399640967334e91728863b8eaa922582be
 lib32disabled=yes

From 268e1b255d13b7c2a65dfc6a87a3154dc95d7667 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 25 Aug 2021 14:34:32 -0400
Subject: [PATCH 844/904] python3-cryptography_vectors: update to 3.4.8.

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

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index ec4e2df05403..9b1f95b65d81 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=3.4.7
+version=3.4.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=a7ac3aaa57514687696ad65f833e5e39b6fa3c5d41de2b8c938346ee119204c2
+checksum=4c84410257993d3de058b44b777a49e1da2ae35ebea2970a360c7e3aa0f580f2
 
 post_install() {
 	vlicense LICENSE

From 14bb7f2ebbbe387bd5ffe2aacbf18f888f6bfcb0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 25 Aug 2021 14:36:50 -0400
Subject: [PATCH 845/904] python3-cryptography: update to 3.4.8.

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

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 464e1c434500..dafe1e84c0ef 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=3.4.7
+version=3.4.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713
+checksum=94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 3822c7164871033daa7bd51a57329dad4a36e1ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 25 Aug 2021 14:43:22 -0400
Subject: [PATCH 846/904] python3-hypothesis: update to 6.15.0.

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

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index d8b1fe28dd5e..6cf660bda17e 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.14.0
+version=6.15.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=677b97e7fba4bc0d69c425f520928f7ef3eaea79344c1a9e7ef7b7b553c97118
+checksum=454d20cedf70cbd479810ad54e47cf1d42ef58f1fb8ff02e7f5481f1d3bdc706
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 73dbd4f5a987e2ae05b80e7845a5c77af1b53c4c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 25 Aug 2021 14:44:02 -0400
Subject: [PATCH 847/904] python3-prompt_toolkit: update to 3.0.20.

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

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 2bf2dc197496..f9da6bb0b05b 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.19
+version=3.0.20
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f
+checksum=eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From 140eee9300700bdb709885bd2f00f89fdd4c4bd2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 25 Aug 2021 14:46:26 -0400
Subject: [PATCH 848/904] python3-scikit-image: update to 0.18.3.

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

diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index 69443f2d00cd..3a8a84bff61a 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scikit-image'
 pkgname=python3-scikit-image
-version=0.18.2
+version=0.18.3
 revision=1
 _pkgname="${pkgname#python3-}"
 wrksrc="${_pkgname}-${version}"
@@ -15,7 +15,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://scikit-image.org/"
 distfiles="https://github.com/${_pkgname}/${_pkgname}/archive/v${version}.tar.gz"
-checksum=0e994e85b1619e804961eb8b14c63323c5ecfdd0f6d5541681e114c48201b4d3
+checksum=a8d1c7473fc9399447a4cd5718c90338fffd543622d9e6f3d9feca43f1a9cb15
 # Tests require data files and unpackaged dependencies
 make_check=no
 

From ce07711646a7f1176f48a800484b6ad5924ca9e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 25 Aug 2021 15:17:54 -0400
Subject: [PATCH 849/904] maturin: update to 0.11.3.

---
 srcpkgs/maturin/patches/add-ppc-tier3.patch | 12 ++++++++++++
 srcpkgs/maturin/template                    | 14 ++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch
index b27b1ec92d63..661f003dd1d8 100644
--- a/srcpkgs/maturin/patches/add-ppc-tier3.patch
+++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch
@@ -67,3 +67,15 @@ diff -ur src/target.rs src/target.rs
              Arch::X86 => 32,
              Arch::X86_64 => 64,
              Arch::S390X => 64,
+diff -ur src/auditwheel/audit.rs src/auditwheel/audit.rs
+--- a/src/auditwheel/audit.rs
++++ b/src/auditwheel/audit.rs
+@@ -278,6 +278,8 @@
+                             Arch::Armv7L => "libc.musl-armv7.so.1",
+                             Arch::Powerpc64Le => "libc.musl-ppc64le.so.1",
+                             Arch::Powerpc64 => "", // musllinux doesn't support ppc64
++                            Arch::PowerpcLe => "", // musllinux doesn't support ppcle
++                            Arch::Powerpc => "",   // musllinux doesn't support ppc
+                             Arch::X86 => "libc.musl-x86.so.1",
+                             Arch::X86_64 => "libc.musl-x86_64.so.1",
+                             Arch::S390X => "libc.musl-s390x.so.1",
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index df1e6e3a4644..7d8167c98ee3 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.11.2
+version=0.11.3
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -16,9 +16,11 @@ license="Apache-2.0, MIT"
 homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
- https://github.com/bytecodealliance/target-lexicon/archive/v0.12.1.tar.gz"
-checksum="4c37b25c327fedf46c0b0833d0e8a5c69e9edcdfeb5b6c946b94198001044f1d
- 0d9843a39228a70c05d4f6ebb1bc8c36900176ed71e40a410a4ef0f99fe510fe"
+ https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz"
+checksum="e65864a36be44456da0f9174de12fe3ea02bb87a968b5333ace3b122869dd6b2
+ b6c2ddab7498cf6eab8e637a5b7895f3170b2f9ef989861d1ff33af6c8459b27"
+# Tests use unstable features and fail to build
+make_check=no
 
 post_extract() {
 	mv ../target-lexicon* target-lexicon
@@ -42,10 +44,6 @@ post_build() {
 	vtargetrun "${_matbin}" completions bash > maturin.bash
 }
 
-do_check() {
-	echo "Tests use unstable features and fail to build; skipping"
-}
-
 post_install() {
 	vlicense license-mit LICENSE-MIT
 	python3 setup.py install --prefix=/usr --root=${DESTDIR}

From 9257c9a04934a978dedb19b0c41c7d2731d9ba23 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 21 Aug 2021 20:18:42 -0700
Subject: [PATCH 850/904] python3-txtorcon: update to 21.1.0.

---
 srcpkgs/python3-txtorcon/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template
index 5a0683f1760d..3f31d4ccdf79 100644
--- a/srcpkgs/python3-txtorcon/template
+++ b/srcpkgs/python3-txtorcon/template
@@ -1,17 +1,20 @@
 # Template file for 'python3-txtorcon'
 pkgname=python3-txtorcon
-version=20.0.0
-revision=2
+version=21.1.0
+revision=1
 wrksrc="txtorcon-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
-depends="python3-automat python3-Twisted"
+depends="lsof python3-automat python3-cryptography python3-six python3-Twisted
+ python3-zope.interface"
+checkdepends="${depends} python3-mock python3-pytest"
 short_desc="Twisted-based asynchronous Tor control protocol implementation"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://txtorcon.readthedocs.io/en/latest/"
 distfiles="https://github.com/meejah/txtorcon/archive/v${version}.tar.gz"
-checksum=8b5f5587ab03bb965c4d162b8ef86c6853c06041b200f2f8a2272caa4bd7cac4
+checksum=61ef40e110a2b52255a6033293d02647dedb63ed9311ce572571c777b2302750
+make_check=ci-skip
 
 post-install() {
 	vlicense LICENSE

From 086b99ce5efef4dda3368a5d993dc0fc122dc27d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 26 Aug 2021 09:47:12 +0200
Subject: [PATCH 851/904] yoshimi: update to 2.1.0.

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

diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 57149966729c..582c55440b30 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=2.0.2
+version=2.1.0
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=e27684cd506ec4140827a6f1dc87085dd66c79091d145ce9807628fb5a9f3bf0
+checksum=0ba966c2e608712c21e2bdcb395227e93d35bea07a80b3f9ed01a37b9154f4df
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;

From ba2e09b8777035af70d99e89bd48b7cdc4427f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 26 Aug 2021 11:58:54 +0200
Subject: [PATCH 852/904] doctl: update to 1.64.0.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5dacf1f24446 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.64.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=ad3ff9afac67e6065a602bca783da0d86747a66fde24e542e4947f73b794380b

From f295f83ddc5287d41a86b93773b2c5b9574beef7 Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Thu, 26 Aug 2021 09:04:19 +0200
Subject: [PATCH 853/904] aria2: update to 1.36.0

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

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index bacfa29e25e7..88c1e31be46b 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,7 +1,7 @@
 # Template file for 'aria2'
 pkgname=aria2
-version=1.35.0
-revision=3
+version=1.36.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://aria2.github.io/"
 changelog="https://raw.githubusercontent.com/aria2/aria2/master/NEWS"
 distfiles="https://github.com/aria2/aria2/releases/download/release-${version}/aria2-${version}.tar.xz"
-checksum=1e2b7fd08d6af228856e51c07173cfcf987528f1ac97e04c5af4a47642617dfd
+checksum=58d1e7608c12404f0229a3d9a4953d0d00c18040504498b483305bcb3de907a5
 
 libaria2_package() {
 	short_desc="Multi-Protocol/multi-source download library"

From 87d669c75bdcd814823025f8425411b93ffb62a9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 25 Aug 2021 12:34:54 +0200
Subject: [PATCH 854/904] janet: update to 1.17.0.

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

diff --git a/common/shlibs b/common/shlibs
index 0ef8dd581524..9d2575e83a70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3862,7 +3862,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.16 janet-1.16.0_1
+libjanet.so.1.17 janet-1.17.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index d3c71796a070..8479cf36d075 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.16.1
+version=1.17.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://janet-lang.org/"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=ed9350ad7f0270e67f18a78dae4910b9534f19cd3f20f7183b757171e8cc79a5
+checksum=45126be7274e0a298dcbe356b5310bd9328c94eb3a562316813fa9774ca34bcc
 
 post_install() {
 	vlicense LICENSE

From c87a5b7f0394f47bd7f1e3721832ebf2d2454f69 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 25 Aug 2021 12:36:29 +0200
Subject: [PATCH 855/904] crawl: update to 0.27.1.

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

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..2523f4586f13 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.27.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=062f1285852fced23ecb2f272ad132467e12e7e251e02aaa84f37280b55ba63e
 nocross=yes
 
 post_extract() {

From f4860e35763daed65be2d0417d6e5f3d5d80ba97 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 25 Aug 2021 12:36:48 +0200
Subject: [PATCH 856/904] crawl-tiles: update to 0.27.1.

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

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..0aa52ca7e7fb 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.27.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=062f1285852fced23ecb2f272ad132467e12e7e251e02aaa84f37280b55ba63e
 nocross=yes
 
 post_extract() {

From 888962ca2e022bef0891397f7cfdc9e98b102822 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 25 Aug 2021 12:38:49 +0200
Subject: [PATCH 857/904] iana-etc: update to 20210818.

---
 srcpkgs/iana-etc/files/services | 3 +++
 srcpkgs/iana-etc/template       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index d5c2cf602996..1367be1aedee 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -8676,6 +8676,8 @@ checkoutdb       5505/udp
 amc              5506/tcp
 amc              5506/udp
 psl-management   5507/tcp
+matter           5540/tcp
+matter           5540/udp
 cbus             5550/tcp
 sgi-eventmond    5553/tcp
 sgi-eventmond    5553/udp
@@ -10944,6 +10946,7 @@ emwavemsg       20480/tcp
 emwavemsg       20480/udp
 track           20670/tcp
 track           20670/udp
+crtech-nlm      20810/tcp
 athand-mmp      20999/tcp
 athand-mmp      20999/udp
 irtrans         21000/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index c6974782c139..2db36f5ae774 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -1,7 +1,7 @@
 # Template file for 'iana-etc'
 pkgname=iana-etc
 reverts="202001016_1"
-version=20210514
+version=20210818
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From 248fc113aa952f288de10e787f3860dc8072df87 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 25 Aug 2021 12:44:09 +0200
Subject: [PATCH 858/904] schilytools: update to 2021.08.14.

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

diff --git a/srcpkgs/schilytools/template b/srcpkgs/schilytools/template
index dc2c974e1cc9..a33b805adf12 100644
--- a/srcpkgs/schilytools/template
+++ b/srcpkgs/schilytools/template
@@ -1,6 +1,6 @@
 # Template file for 'schilytools'
 pkgname=schilytools
-version=2021.04.21
+version=2021.08.14
 revision=1
 wrksrc="schily-${version//./-}"
 build_style=meta
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CDDL-1.0"
 homepage="https://sourceforge.net/projects/schilytools/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/schily-${version//./-}.tar.bz2"
-checksum=4c2666b872269cf36318c957d1125aea1946a20ede4e989ce5ed864cdfcfddb1
+checksum=fb4e4c0ca534aa28127f7e7556c9017e059f4c7b93f6bfc33965f28091230f10
 nocross=yes  # configure + re-builds with itself
 
 do_build() {

From be1a7077192aed2e57a9cf8c75c3298ec779807a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 26 Aug 2021 13:32:41 +0200
Subject: [PATCH 859/904] pinentry: update to 1.2.0.

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

diff --git a/srcpkgs/pinentry/template b/srcpkgs/pinentry/template
index c14de641495c..a18a8e615306 100644
--- a/srcpkgs/pinentry/template
+++ b/srcpkgs/pinentry/template
@@ -2,7 +2,7 @@
 # NOTE: keep this pkg synchronized with srcpkgs/pinentry-gtk.
 # NOTE: it's splitted this way to avoid cyclic dependencies.
 pkgname=pinentry
-version=1.1.1
+version=1.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--without-libcap --enable-pinentry-tty
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnupg.org/related_software/pinentry/index.html"
 distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2"
-checksum=cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f
+checksum=10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470
 
 alternatives="pinentry:pinentry:/usr/bin/pinentry-curses"
 

From fc36b8a2a496de359130042cb057a3c0c0e5292b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 26 Aug 2021 13:33:33 +0200
Subject: [PATCH 860/904] pinentry-gtk: update to 1.2.0.

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

diff --git a/srcpkgs/pinentry-gtk/template b/srcpkgs/pinentry-gtk/template
index 7f30fecf7eaa..0424771ff82d 100644
--- a/srcpkgs/pinentry-gtk/template
+++ b/srcpkgs/pinentry-gtk/template
@@ -4,7 +4,7 @@
 _desc="PIN or passphrase entry dialogs for GnuPG"
 
 pkgname=pinentry-gtk
-version=1.1.1
+version=1.2.0
 revision=1
 wrksrc="pinentry-${version}"
 build_style=gnu-configure
@@ -21,7 +21,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnupg.org/related_software/pinentry/index.html"
 distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2"
-checksum=cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f
+checksum=10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470
 
 alternatives="pinentry:pinentry:/usr/bin/pinentry-gtk-2"
 

From 5400dc0b42e5ee3610bf6abee1ee17582dfe477e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 14 May 2021 09:40:17 -0700
Subject: [PATCH 861/904] tanidvr: fix license, other lint

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

diff --git a/srcpkgs/tanidvr/template b/srcpkgs/tanidvr/template
index 7381995de7e4..1394333c1722 100644
--- a/srcpkgs/tanidvr/template
+++ b/srcpkgs/tanidvr/template
@@ -1,12 +1,12 @@
 # Template file for 'tanidvr'
-pkgname="tanidvr"
-version="1.4.1"
-revision=1
+pkgname=tanidvr
+version=1.4.1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-short_desc="A tool for DVRs and IP cameras based on the DVR-IP protocol"
+short_desc="Tool for DVRs and IP cameras based on the DVR-IP protocol"
 maintainer="ymoon <ymoon@hyenas.tech>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://tanidvr.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum="7c0d17c1dd75b3e3b05108451f9d77222dd8938fbf96e1467c3a48dbd9b7bbc9"

From 3685b38e3d4932906cfa990eafea6e42f6c51d11 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:14:52 -0700
Subject: [PATCH 862/904] tc-play: fix license, vsed

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

diff --git a/srcpkgs/tc-play/template b/srcpkgs/tc-play/template
index 0f49755ebaf9..c8ec5a85d506 100644
--- a/srcpkgs/tc-play/template
+++ b/srcpkgs/tc-play/template
@@ -1,7 +1,7 @@
 # Template file for 'tc-play'
 pkgname=tc-play
 version=3.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="-f Makefile.classic PBKDF_BACKEND=gcrypt"
 make_build_target="tcplay"
@@ -10,14 +10,15 @@ make_install_target="install_program"
 makedepends="device-mapper-devel libuuid-devel libgcrypt-devel"
 short_desc="Free and simple TrueCrypt implementation based on dm-crypt"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-2-clause"
+license="BSD-2-Clause"
 homepage="https://github.com/bwalex/tc-play"
 distfiles="https://github.com/bwalex/${pkgname}/archive/v${version}.tar.gz"
 checksum=ad53cd814a23b4f61a1b2b6dc2539624ffb550504c400c45cbd8cd1da4c7d90a
 
 pre_build() {
-	sed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
+	vsed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
 }
+
 post_install() {
 	vlicense LICENSE
 }

From aa121348711b4705bdc993b880120e0b3ab49fc8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:17:23 -0700
Subject: [PATCH 863/904] teensy_loader_cli: fix license, http->https

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

diff --git a/srcpkgs/teensy_loader_cli/template b/srcpkgs/teensy_loader_cli/template
index 267415fa1561..28d93a5e5c05 100644
--- a/srcpkgs/teensy_loader_cli/template
+++ b/srcpkgs/teensy_loader_cli/template
@@ -1,14 +1,14 @@
 # Template file for 'teensy_loader_cli'
 pkgname=teensy_loader_cli
 version=2.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_target=teensy_loader_cli
 makedepends="libusb-compat-devel"
 short_desc="Command line Teensy Loader"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
-license="GPL-3"
-homepage="http://www.pjrc.com/teensy/loader_cli.html"
+license="GPL-3.0-only"
+homepage="https://www.pjrc.com/teensy/loader_cli.html"
 distfiles="https://github.com/PaulStoffregen/teensy_loader_cli/archive/${version}.tar.gz"
 checksum=5c36fe45b9a3a71ac38848b076cd692bf7ca8826a69941c249daac3a1d95e388
 

From e59e0bbfdaa5d5bc394fed88fc3534f891771a28 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:21:59 -0700
Subject: [PATCH 864/904] teeworlds: fix license

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

diff --git a/srcpkgs/teeworlds/template b/srcpkgs/teeworlds/template
index 268c85e43ac8..8177724af1fb 100644
--- a/srcpkgs/teeworlds/template
+++ b/srcpkgs/teeworlds/template
@@ -1,12 +1,12 @@
 # Template file for 'teeworlds'
 pkgname=teeworlds
 version=0.7.5
-revision=1
+revision=2
 hostmakedepends="bam python pkg-config"
 makedepends="zlib-devel SDL2-devel glu-devel freetype-devel"
 short_desc="Retro multiplayer shooter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:Zlib-like"
 homepage="https://www.teeworlds.com"
 distfiles="https://github.com/teeworlds/teeworlds/archive/${version}.tar.gz"
 checksum=6e67846b38750d2a372d7835fa3775db016458a20a85aa52f1c758102ddd4abe

From 8427f078fcf654c4fdce1491b1ae7c8896d76873 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:26:31 -0700
Subject: [PATCH 865/904] telepathy-gabble: fix license, http->https, verify
 python2

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

diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 7156a96738a9..23cc05bec9ef 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,7 +1,7 @@
 # Template file for 'telepathy-gabble'
 pkgname=telepathy-gabble
 version=0.18.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
  --enable-handle-leak-debug --disable-debug --disable-static"
@@ -12,10 +12,10 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
 depends="telepathy-glib>=0.21 ca-certificates"
 short_desc="Jabber/XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://telepathy.freedesktop.org"
+license="LGPL-2.1-or-later"
+homepage="https://telepathy.freedesktop.org"
 distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
-python_version=2 #unverified
+python_version=2
 nocross=yes
 lib32disabled=yes

From 7b2cd655ff6335e0f5429ad3e54fb23f0dc2d749 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:13:11 -0700
Subject: [PATCH 866/904] tesseract: fix license, release version marker, vsed

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

diff --git a/srcpkgs/tesseract/template b/srcpkgs/tesseract/template
index 5eca40635fd4..3c972c712f48 100644
--- a/srcpkgs/tesseract/template
+++ b/srcpkgs/tesseract/template
@@ -1,26 +1,27 @@
 # Template file for 'tesseract'
 pkgname=tesseract
 version=1
-revision=4
+revision=5
+_release="2014_05_12"
 wrksrc="$pkgname"
 hostmakedepends="pkg-config ImageMagick"
 makedepends="SDL2_image-devel SDL2_mixer-devel MesaLib-devel libpng-devel zlib-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="FPS game focused on instagib deathmatch and capture-the-flag gameplay"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://tesseract.gg/"
-distfiles="http://download.tuxfamily.org/tesseract/tesseract_2014_05_12_first_edition_linux.tar.xz"
+distfiles="http://download.tuxfamily.org/tesseract/tesseract_${_release}_first_edition_linux.tar.xz"
 checksum=8d6e07dd154a40a3f593e52289335c036f06cf90a0ebc400c4650adb3395a0f4
 
 pre_build() {
 	for dim in 16 32 48 64 128 256 512; do
 		convert -resize "${dim}x${dim}" media/interface/cube.png "${pkgname}${dim}.png"
 	done
-	sed -i src/Makefile \
+	vsed -i src/Makefile \
 		-e"s;-o tess_client;${LDFLAGS} &;" \
 		-e"s;-o tess_server;${LDFLAGS} &;"
-	sed -i src/enet/Makefile \
+	vsed -i src/enet/Makefile \
 		-e"s;^\(CFLAGS=\).*;\1${CFLAGS};"
 }
 do_build() {

From 6b259766148d15664401286da1bbcad7316358fb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:19:18 -0700
Subject: [PATCH 867/904] testdisk: fix license, http->https

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

diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index a7d635ddb7eb..754e90273be9 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
 # Template file for 'testdisk'
 pkgname=testdisk
 version=7.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-ewf --enable-sudo"
 makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
 depends="sudo"
 short_desc="Powerful free data recovery software"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.cgsecurity.org/"
-distfiles="http://www.cgsecurity.org/$pkgname-$version.tar.bz2"
+license="GPL-2.0-or-later"
+homepage="https://www.cgsecurity.org/"
+distfiles="https://www.cgsecurity.org/$pkgname-$version.tar.bz2"
 checksum=1413c47569e48c5b22653b943d48136cb228abcbd6f03da109c4df63382190fe

From 01b1131e6d1a82aeadc9f523d3ff8c3a264b1ddc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:25:01 -0700
Subject: [PATCH 868/904] texlive2014-bin: fix license, other lint

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

diff --git a/srcpkgs/texlive2014-bin/template b/srcpkgs/texlive2014-bin/template
index 4e5b199b04f3..ebd5321c56e8 100644
--- a/srcpkgs/texlive2014-bin/template
+++ b/srcpkgs/texlive2014-bin/template
@@ -1,19 +1,19 @@
 # Template file for 'texlive2014-bin'
 pkgname=texlive2014-bin
 version=2014
-revision=9
+revision=10
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
 short_desc="TeX Live Binary distribution through tl-install"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, LPPL-1.3c"
 homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/tlnet-final/install-tl-unx.tar.gz"
 checksum=051e6425d604767eb12289c67c87ccdb1af0750b0b1d22383fd9387926234217
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From b420fdd63a378dd149f191d37f97a9a03b0d0bc7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:34:56 -0700
Subject: [PATCH 869/904] texlive2016-bin: fix license, template layout

---
 srcpkgs/texlive2016-bin/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/texlive2016-bin/template b/srcpkgs/texlive2016-bin/template
index 6f2ed09c3669..02468263a397 100644
--- a/srcpkgs/texlive2016-bin/template
+++ b/srcpkgs/texlive2016-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2016-bin'
 pkgname=texlive2016-bin
 version=2016
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=a0559306f4ef1903b92c829a11177dcbf3b85ddb9c6b512a80791e2c543f7d95
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"
@@ -23,12 +23,12 @@ desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
 desc_option_full="Install TeXLive using scheme-full"
 
-pre_install(){
+pre_install() {
 	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
 		${wrksrc}/install-tl*/tlpkg/installer/wget
 }
 
-do_install(){
+do_install() {
 	vmkdir opt/texlive${version}-installer
 	vcopy "install-tl-*/*" /opt/texlive${version}-installer
 	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer

From 6622000c463c20a372658fc1e14d42e1f0e41019 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:38:12 -0700
Subject: [PATCH 870/904] texlive2017-bin: fix license, template layout

---
 srcpkgs/texlive2017-bin/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/texlive2017-bin/template b/srcpkgs/texlive2017-bin/template
index 2dd12a23e45c..bcc741140008 100644
--- a/srcpkgs/texlive2017-bin/template
+++ b/srcpkgs/texlive2017-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2017-bin'
 pkgname=texlive2017-bin
 version=2017
-revision=4
+revision=5
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=d4e07ed15dace1ea7fabe6d225ca45ba51f1cb7783e17850bc9fe3b890239d6d
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"
@@ -23,12 +23,12 @@ desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
 desc_option_full="Install TeXLive using scheme-full"
 
-pre_install(){
+pre_install() {
 	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
 		${wrksrc}/install-tl*/tlpkg/installer/wget
 }
 
-do_install(){
+do_install() {
 	vmkdir opt/texlive${version}-installer
 	vcopy "install-tl-*/*" /opt/texlive${version}-installer
 	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer

From d4d2a3f0db8d5f1760848e168a625a4c01d28bf0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:40:06 -0700
Subject: [PATCH 871/904] texlive2018-bin: fix license, template layout

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

diff --git a/srcpkgs/texlive2018-bin/template b/srcpkgs/texlive2018-bin/template
index 9fec7b8246c7..5f94dea2a144 100644
--- a/srcpkgs/texlive2018-bin/template
+++ b/srcpkgs/texlive2018-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2018-bin'
 pkgname=texlive2018-bin
 version=2018
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=82c13110852af162c4c5ef1579fa2f4f51c2040850ec02fb7f97497da45eb446
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From 7072660854fe88d8edff7ec47f1228fe229b69cf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:41:57 -0700
Subject: [PATCH 872/904] texlive2019-bin: fix license, template layout

---
 srcpkgs/texlive2019-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/texlive2019-bin/template b/srcpkgs/texlive2019-bin/template
index fc0553b08029..7c729aeb3ade 100644
--- a/srcpkgs/texlive2019-bin/template
+++ b/srcpkgs/texlive2019-bin/template
@@ -1,19 +1,19 @@
 # Template file for 'texlive2019-bin'
 pkgname=texlive2019-bin
 version=2019
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=44aa41b5783e345b7021387f19ac9637ff1ce5406a59754230c666642dfe7750
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From a5df86795947419d9fd46c94a8135343800c132f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:44:04 -0700
Subject: [PATCH 873/904] texlive2020-bin: fix license, template layout

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

diff --git a/srcpkgs/texlive2020-bin/template b/srcpkgs/texlive2020-bin/template
index 939f8a2964cb..a6ad08f92236 100644
--- a/srcpkgs/texlive2020-bin/template
+++ b/srcpkgs/texlive2020-bin/template
@@ -1,18 +1,18 @@
 # Template file for 'texlive2020-bin'
 pkgname=texlive2020-bin
 version=2020
-revision=4
+revision=5
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=7c90a50e55533d57170cbc7c0370a010019946eb18570282948e1af6f809382d
-create_wrksrc=yes
 
 # Package build options
 build_options="basic small medium full"

From 777f94cd2b0c48d8f915d984541d44b35bbe7e5d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:45:56 -0700
Subject: [PATCH 874/904] thingylaunch: fix license

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

diff --git a/srcpkgs/thingylaunch/template b/srcpkgs/thingylaunch/template
index 5e862376125b..b91a40b01dc6 100644
--- a/srcpkgs/thingylaunch/template
+++ b/srcpkgs/thingylaunch/template
@@ -1,14 +1,14 @@
 # Template file for 'thingylaunch'
 pkgname=thingylaunch
 version=2.0.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_XCB=ON"
 hostmakedepends="pkg-config"
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="X11 application launcher with tab-completion, history, and bookmarks"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://gahr.ch/thingylaunch/"
 distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz"
 checksum=4d9cc6b826bddb3d02836f721316bfc24c2b31f75c9c2d5077ae162eb3d60b60

From 964fad2973ea5a824e0d9f2039678984eda009b2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:47:50 -0700
Subject: [PATCH 875/904] tinyxml: fix license, description, layout

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

diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template
index 29c19bb162d8..c6a0a9199c07 100644
--- a/srcpkgs/tinyxml/template
+++ b/srcpkgs/tinyxml/template
@@ -1,12 +1,12 @@
 # Template file for 'tinyxml'
 pkgname=tinyxml
 version=2.6.2
-revision=10
+revision=11
 wrksrc="${pkgname}"
-short_desc="A simple, small, C++ XML parser"
+short_desc="Simple, small, C++ XML parser"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="Zlib"
 homepage="http://www.grinninglizard.com/tinyxml/"
-license="zlib"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_2_6_2.tar.gz"
 checksum=15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593
 

From 47d20bff32131aae89a4d85eb8cab8fcc1ec5443 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:51:51 -0700
Subject: [PATCH 876/904] tif22pnm: fix license

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

diff --git a/srcpkgs/tif22pnm/template b/srcpkgs/tif22pnm/template
index 0a49a2d969df..fb04e836aceb 100644
--- a/srcpkgs/tif22pnm/template
+++ b/srcpkgs/tif22pnm/template
@@ -1,14 +1,14 @@
 # Template file for 'tif22pnm'
 pkgname=tif22pnm
 version=2014.01.09.1
-revision=1
+revision=2
 _githash="22217c1a3ea355a899e9c7c79903488ca13d1dfe"
 wrksrc="tif22pnm-${_githash}"
 hostmakedepends="pkg-config"
 makedepends="libpng-devel tiff-devel"
 short_desc="TIFF-to-PNM converter and png22pnm, a PNG-to-PNM converter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/pts/tif22pnm"
 distfiles="https://github.com/pts/tif22pnm/archive/${_githash}.tar.gz"
 checksum=1ffd4bb69724e48ce7a6064fa0801a52043dd2b61f414cebd1803d0cd520a6a2

From d4b0af186345ba6954f051dfdb3bf95b2045cacb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:57:36 -0700
Subject: [PATCH 877/904] tiptop: fix license, layout, vsed

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

diff --git a/srcpkgs/tiptop/template b/srcpkgs/tiptop/template
index 87f76780a85b..140198908629 100644
--- a/srcpkgs/tiptop/template
+++ b/srcpkgs/tiptop/template
@@ -1,20 +1,20 @@
 # Template file for 'tiptop'
 pkgname=tiptop
 version=2.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex"
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 makedepends="ncurses-devel libxml2-devel"
 short_desc="Performance monitoring tool using hardware counters"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://tiptop.gforge.inria.fr/"
 distfiles="http://tiptop.gforge.inria.fr/releases/${pkgname}-${version}.tar.gz"
 checksum=51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 
 post_extract() {
-	sed -i "s/\`uname -m\`/$XBPS_TARGET_MACHINE/" configure
+	vsed -i "s/\`uname -m\`/$XBPS_TARGET_MACHINE/" configure
 }
 
 post_install() {

From e4adaf54afdd229526ab1660d668b1fcb090e48b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:58:01 -0700
Subject: [PATCH 878/904] tnftp: fix license

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

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index c0b75c164f25..c2c9dfd4e2c8 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,13 +1,13 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD"
+license="BSD-4-Clause"
 homepage="http://netbsd.gw.com/cgi-bin/man-cgi?ftp"
 distfiles="ftp://ftp.netbsd.org/pub/NetBSD/misc/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=ba4a92b693d04179664524eef0801c8eed4447941c9855f377f98f119f221c03

From 57ba89777ac2d1dacaab035c1ab7dac145217524 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 16:55:45 -0700
Subject: [PATCH 879/904] tolua: fix license

The license is very poorly defined here. The only place that makes any
comment towards that is the luadist dist.info file. My guess is the
intent is for a CC0 or Public Domain type licensing but they didn't say
so explicitly.
---
 srcpkgs/tolua/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tolua/template b/srcpkgs/tolua/template
index aa0288305255..686665d1fe99 100644
--- a/srcpkgs/tolua/template
+++ b/srcpkgs/tolua/template
@@ -1,13 +1,13 @@
 # Template file for 'tolua'
 pkgname=tolua
 version=5.2.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="lua52-devel"
-short_desc="A tool that greatly simplifies the integration of C/C++ code with Lua"
+short_desc="Tool that greatly simplifies the integration of C/C++ code with Lua"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-2"
+license="custom:as-is"
 homepage="https://github.com/LuaDist/tolua"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=121ae6b6e1fb86d064e5994be5ef43ee2e20d2602f40e6ba48fa9de867ffc3d5
@@ -15,6 +15,10 @@ checksum=121ae6b6e1fb86d064e5994be5ef43ee2e20d2602f40e6ba48fa9de867ffc3d5
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2 -fPIC"
 nopie=yes
 
+post_install() {
+	vlicense README
+}
+
 tolua-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 266a5ea271cd1c30325e165d602a09b6245ebfd9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 16:59:36 -0700
Subject: [PATCH 880/904] tpm-tools: fix license

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

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index c581d1653452..696aec5ae43c 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,14 +1,14 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=7
+revision=8
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
 makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="CPL"
+license="CPL-1.0"
 homepage="http://trousers.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/trousers/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68

From 6d6a75e7f7ce7c30304b40f0e26589eb98a004af Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:01:57 -0700
Subject: [PATCH 881/904] tp_smapi-dkms: fix license, layout

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

diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template
index 4a711af14eca..0ef1ac8f7b47 100644
--- a/srcpkgs/tp_smapi-dkms/template
+++ b/srcpkgs/tp_smapi-dkms/template
@@ -1,12 +1,12 @@
 # Template file for 'tp_smapi-dkms'
 pkgname=tp_smapi-dkms
 version=0.43
-revision=1
-wrksrc=tp_smapi-${version}
+revision=2
 archs="i686* x86_64*"
+wrksrc=tp_smapi-${version}
 short_desc="IBM ThinkPad hardware functions driver"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.thinkwiki.org/wiki/Tp_smapi"
 distfiles="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${version}/tp_smapi-${version}.tgz"
 checksum=bcef9cd045d52a74d719b2a67ac4f5324994a856f123c0fbc55f1d769d367110

From 0a326555f357d27a6dfe8289c43bcac39293b2d2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:07:33 -0700
Subject: [PATCH 882/904] tracebox: fix license, layout, description

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

diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index b76bb0123c88..5cf656b50641 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -1,18 +1,17 @@
 # Template file for 'tracebox'
 pkgname=tracebox
 version=0.4.4
-revision=4
+revision=5
 _click_ver=2.0.1
 _crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e
 _crafter_ver=0.3.3git
-build_style=gnu-configure
 archs="i686 x86_64"
+build_style=gnu-configure
 hostmakedepends="automake pkg-config libtool unzip"
 makedepends="libpcap-devel json-c-devel lua53-devel"
-short_desc="A middlebox detection tool"
+short_desc="Middlebox detection tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-nocross=yes
+license="GPL-2.0-only"
 homepage="http://www.tracebox.org/"
 distfiles="
  https://github.com/tracebox/tracebox/archive/v${version}.tar.gz>tracebox-${version}.tar.gz
@@ -22,6 +21,7 @@ checksum="
  d212f02c6dfee51ab198413a7a53547fc2b5fe139efb3ebf082f1729c2d18f9f
  4e48591cb385000ee8daedf3cc18d4b00a9c5a142cc001e0780f0c7ebd713764
  d3a182a06b86a0bff7f9f5792876f8da9db9dd7936f36ef1b40770c400f43b97"
+nocross=yes
 
 CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1"
 

From 54ff5d947a9009c2e5b416cdd64ab2a386add60c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:10:40 -0700
Subject: [PATCH 883/904] traceroute: fix license

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

diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template
index f92c929c300f..73e12c1c4c90 100644
--- a/srcpkgs/traceroute/template
+++ b/srcpkgs/traceroute/template
@@ -1,10 +1,10 @@
 # Template file for 'traceroute'
 pkgname=traceroute
 version=2.1.0
-revision=3
+revision=4
 short_desc="Traces the route taken by packets over an IPv4/IPv6 network"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://traceroute.sourceforge.net"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
 checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6

From 61b7cc30a558b10f1f8a4037f36f293a73f8b0a5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:15:32 -0700
Subject: [PATCH 884/904] trn: fix license

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

diff --git a/srcpkgs/trn/template b/srcpkgs/trn/template
index 749675e0486c..c2a7873df584 100644
--- a/srcpkgs/trn/template
+++ b/srcpkgs/trn/template
@@ -1,7 +1,7 @@
 # Template file for 'trn'
 pkgname=trn
 version=4.0test77
-revision=6
+revision=7
 wrksrc=$pkgname-${version/test/-test}
 build_style=gnu-makefile
 hostmakedepends="groff bison"
@@ -9,7 +9,7 @@ makedepends="ncurses-devel gettext-devel libnsl-devel"
 depends="virtual?smtp-server"
 short_desc="Text-based threaded Usenet newsreader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:freeware"
 homepage="http://trn.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}4/${wrksrc}.tar.gz"
 checksum=9ab0430244903ad86ed74fcc2fdc39dc043d23968888e071313050a967b8a6ff
@@ -35,4 +35,3 @@ do_install() {
 		mansrc=${DESTDIR}/usr/share/man/man1
 	vlicense LICENSE
 }
-

From 8fca1f626125161ac297af767de17fa442bde4e3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 20:44:54 -0700
Subject: [PATCH 885/904] twoftpd: fix license, distfiles, mark as nocross,
 vsed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sgn: increase opt level, patch for log2
Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Close: #31214
---
 srcpkgs/twoftpd/patches/log2-conflict.patch | 62 +++++++++++++++++++++
 srcpkgs/twoftpd/template                    | 15 +++--
 2 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/twoftpd/patches/log2-conflict.patch

diff --git a/srcpkgs/twoftpd/patches/log2-conflict.patch b/srcpkgs/twoftpd/patches/log2-conflict.patch
new file mode 100644
index 000000000000..b3a8079deff5
--- /dev/null
+++ b/srcpkgs/twoftpd/patches/log2-conflict.patch
@@ -0,0 +1,62 @@
+ log2 is declared in math.h
+Index: twoftpd-1.43/log.c
+===================================================================
+--- twoftpd-1.43.orig/log.c
++++ twoftpd-1.43/log.c
+@@ -32,14 +32,14 @@ void log_start(void)
+   obuf_puts(&errbuf, "]: ");
+ }
+ 
+-void log1(const char* a)
++void twoftpd_log1(const char* a)
+ {
+   log_start();
+   log_str(a);
+   log_end();
+ }
+ 
+-void log2(const char* a, const char* b)
++void twoftpd_log2(const char* a, const char* b)
+ {
+   log_start();
+   log_str(a);
+Index: twoftpd-1.43/log.h
+===================================================================
+--- twoftpd-1.43.orig/log.h
++++ twoftpd-1.43/log.h
+@@ -8,7 +8,7 @@ extern void log_start(void);
+ #define log_uint(U) obuf_putu(&errbuf, U)
+ #define log_end() obuf_putsflush(&errbuf, "\n")
+ 
+-extern void log1(const char*);
+-extern void log2(const char*, const char*);
++extern void twoftpd_log1(const char*);
++extern void twoftpd_log2(const char*, const char*);
+ 
+ #endif
+Index: twoftpd-1.43/main.c
+===================================================================
+--- twoftpd-1.43.orig/main.c
++++ twoftpd-1.43/main.c
+@@ -171,18 +171,18 @@ static int dispatch_request(const comman
+   cmd = find_command(table1);
+   if (!cmd && table2) cmd = find_command(table2);
+   if (!cmd) {
+-    if (log) log2(request, req_param ? req_param : "(no parameter)");
++    if (log) twoftpd_log2(request, req_param ? req_param : "(no parameter)");
+     return respond(502, 1, "Command not supported.");
+   }
+   
+   if (req_param) {
+-    if (log) log2(cmd->name, cmd->hideparam ? "XXXXXXXX" : req_param);
++    if (log) twoftpd_log2(cmd->name, cmd->hideparam ? "XXXXXXXX" : req_param);
+     if (cmd->fn1)
+       return cmd->fn1();
+     return respond(501, 1, "Command requires no parameter");
+   }
+   else {
+-    if (log) log1(cmd->name);
++    if (log) twoftpd_log1(cmd->name);
+     if (cmd->fn0)
+       return cmd->fn0();
+     return respond(504, 1, "Command requires a parameter");
diff --git a/srcpkgs/twoftpd/template b/srcpkgs/twoftpd/template
index ad63211f5758..babd76ec6f93 100644
--- a/srcpkgs/twoftpd/template
+++ b/srcpkgs/twoftpd/template
@@ -1,33 +1,32 @@
 # Template file for 'twoftpd'
 pkgname=twoftpd
 version=1.43
-revision=4
+revision=5
 build_style=gnu-makefile
-depends="sv-helper ucspi-tcp"
 makedepends="bglibs-devel cvm-devel"
+depends="sv-helper ucspi-tcp"
 short_desc="Simple secure efficient FTP server"
 maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://untroubled.org/twoftpd/"
-distfiles="http://untroubled.org/twoftpd/twoftpd-1.43.tar.gz"
+distfiles="http://untroubled.org/twoftpd/twoftpd-${version}.tar.gz"
 checksum=ed77d2f3020bdbbe1a0a7d9a84780f3525431300e5000901e95a982873e24dc3
 system_accounts="ftp"
 ftp_pgroup="nogroup"
+nocross="deps are nocross"
 
-pre_build() {
+do_configure() {
 	echo '/usr/bin' > conf-bin
 	echo '/usr/share/man' > conf-man
 	echo '/usr/include' > conf-include
 	echo '/usr/lib' > conf-lib
 	echo "$CC $LDFLAGS" > conf-ld
-	sed -e 's|/usr/local/include|/usr/include|' -e "s|gcc|$CC $CFLAGS|" \
-		-i conf-cc
+	echo "$CC $CFLAGS" >conf-cc
 }
 
 do_install() {
 	make install install_prefix=${DESTDIR}
 	vsv twoftpd-anon
-	vlicense COPYING
 	vdoc README
 	vdoc NEWS
 	vdoc ANNOUNCEMENT

From ea1a01b2974a41c07745680d5cfb679008e46b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:53:42 +0700
Subject: [PATCH 886/904] util-linux: update to 2.37.2.

---
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 -------------------
 .../patches/0001-sulogin-fix-getpasswd.patch  | 26 ----------
 srcpkgs/util-linux/template                   |  6 +--
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch

diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..8e622ca3cdc0 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.37.1
-revision=3
+version=2.37.2
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 89a79b6fd85fbe0ea2be067cdff9d160b1067f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:48:54 +0700
Subject: [PATCH 887/904] util-linux-common: update to 2.37.2.

---
 srcpkgs/util-linux-common/template | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 4edf7bb75564..0d94f16d34e8 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.37.1
+version=2.37.2
 revision=1
 wrksrc="util-linux-$version"
 build_style=gnu-configure
@@ -14,10 +14,10 @@ makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 checkdepends="xz tar iproute2 socat procps-ng bc"
 short_desc="Miscellaneous linux utilities - common files"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 post_extract() {
 	# hung inside xbps-src
@@ -44,14 +44,14 @@ do_install() {
 util-linux-libs_package() {
 	short_desc+=" - meta libraries"
 	build_style=meta
-	depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
-	 libmount-${version}_${revision} libsmartcols-${version}_${revision}
-	 libuuid-${version}_${revision}"
+	depends="libfdisk>=${version}_${revision} libblkid>=${version}_${revision}
+	 libmount>=${version}_${revision} libsmartcols>=${version}_${revision}
+	 libuuid>=${version}_${revision}"
 }
 
 libfdisk_package() {
 	short_desc="Library for fdisk(8)"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libfdisk.so.*"
 	}
@@ -70,7 +70,7 @@ libfdisk-devel_package() {
 }
 libmount_package() {
 	short_desc="Library for mount(8)"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libmount.so.*"
 	}
@@ -88,7 +88,7 @@ libmount-devel_package() {
 }
 libblkid_package() {
 	short_desc="Library to handle device identification"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libblkid.so.*"
 	}
@@ -107,14 +107,21 @@ libblkid-devel_package() {
 }
 libuuid_package() {
 	short_desc="UUID library"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
+	license="BSD-3-Clause"
 	pkg_install() {
+		{
+			grep Copyright libuuid/src/*.c
+			cat Documentation/licenses/COPYING.BSD-3-Clause
+		} >uuid.license
+		vlicense uuid.license
 		vmove "usr/lib/libuuid.so.*"
 	}
 }
 libuuid-devel_package() {
 	depends="libuuid>=${version}_${revision}<=${version}_9999"
 	short_desc="UUID library development files"
+	license="BSD-3-Clause"
 	pkg_install() {
 		vmove usr/lib/libuuid.a
 		vmove usr/lib/libuuid.so
@@ -135,7 +142,7 @@ libsmartcols-devel_package() {
 }
 libsmartcols_package() {
 	short_desc="Table or Tree library from util-linux"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove usr/lib/libsmartcols.so.*
 	}

From e9dd79ec4e6127cb1fb9492cc0a683ef6c5fdc55 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 26 Aug 2021 18:43:38 +0200
Subject: [PATCH 888/904] unclutter-xfixes: update to 1.6.

---
 srcpkgs/unclutter-xfixes/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unclutter-xfixes/template b/srcpkgs/unclutter-xfixes/template
index b0c4e1caf2f4..c0022b0aad5e 100644
--- a/srcpkgs/unclutter-xfixes/template
+++ b/srcpkgs/unclutter-xfixes/template
@@ -1,6 +1,6 @@
 # Template file for 'unclutter-xfixes'
 pkgname=unclutter-xfixes
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -12,11 +12,16 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Airblader/unclutter-xfixes"
 distfiles="https://github.com/Airblader/unclutter-xfixes/archive/v${version}.tar.gz"
-checksum=35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11
+checksum=6f7f248f16b7d4ec7cb144b6bc5a66bd49078130513a184f4dc16c498d457db9
 conflicts="unclutter>=0"
 
-pre_build() {
-	sed -e '/^CC/d' \
+post_extract() {
+	vsed -e '/^CC/d' \
 		-e '/^.PHONY: $(TARGET)/d' \
+		-e '/ LICENSE$/d' \
 		-i Makefile
 }
+
+post_install() {
+	vlicense LICENSE
+}

From 6f21b1dcc052174ae9febad1e94e8b9c9fa030ac Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 26 Aug 2021 18:50:38 +0300
Subject: [PATCH 889/904] vale: update to 2.10.5.

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

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..cc37eb6ab7eb 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.5
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=fe6bf766a392c87bc707fa03c23c3bf7664114b0b8df6a99d2af6673ba7a241d
 
 post_install() {
 	vlicense LICENSE

From 2af7375898d0f1e4a24454f05ecc28fa1d04d227 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 26 Aug 2021 19:01:31 +0300
Subject: [PATCH 890/904] New package: vale-style-alex 0.1.1

---
 srcpkgs/vale-style-alex/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/vale-style-alex/template

diff --git a/srcpkgs/vale-style-alex/template b/srcpkgs/vale-style-alex/template
new file mode 100644
index 000000000000..187a380007b3
--- /dev/null
+++ b/srcpkgs/vale-style-alex/template
@@ -0,0 +1,18 @@
+# Template file for 'vale-style-alex'
+pkgname=vale-style-alex
+version=0.1.1
+revision=1
+wrksrc=alex-${version}
+short_desc="Vale-compatible implementation of the alex linter"
+maintainer="Gadzhi Kharkharov <me@kkga.me>"
+license="MIT"
+homepage="https://github.com/errata-ai/alex/"
+distfiles="https://github.com/errata-ai/alex/archive/v${version}.tar.gz"
+checksum=0e0321e459e54a1ca5596c6f16176fdf6491d3df4fca2eb9cc7aff72cffe8cff
+
+do_install() {
+	for f in alex/*.yml; do
+		vinstall "$f" 644 "/usr/share/vale/alex/"
+	done
+	vlicense LICENSE
+}

From 8d3bd779783189e9694a022eeaeeb1962048f34d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 24 Aug 2021 10:26:02 +0300
Subject: [PATCH 891/904] cups-filters: update to 1.28.10.

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

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index e15e1e1078fd..0232b4fe2fbf 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,6 +1,6 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
-version=1.28.9
+version=1.28.10
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
 homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz"
-checksum=2f69372a4fa76dc91e54b4c98ab4c65368e3dfbde92456205c98a39573e860ae
+checksum=cf8c904694c44cf689b5724e46d23da9ae5125d54374b340c642077cc29ca837
 lib32disabled=yes
 
 post_install() {

From dbfeddf5736a8dd7368815cfc5ffb5c2e2741cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 21 Aug 2021 00:00:45 +0200
Subject: [PATCH 892/904] tor: update to 0.4.6.7.

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

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 673b8b969735..39ee33963862 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,6 +1,6 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.6.6
+version=0.4.6.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zstd"
@@ -12,9 +12,9 @@ short_desc="Anonymizing overlay network"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.torproject.org/"
-changelog="https://gitweb.torproject.org/tor.git/plain/ReleaseNotes"
+changelog="https://gitlab.torproject.org/tpo/core/tor/-/raw/main/ChangeLog"
 distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
-checksum=3423189ba455372021ed44e0be576d181f2908cbd9bdef202d9c11c950882e12
+checksum=ff665ce121b2952110bd98b9c8741b5593bf6c01ac09033ad848ed92c2510f9a
 
 conf_files="/etc/tor/torrc"
 system_accounts="tor"

From b09aafdbf2087c6ff0ecb85c891f84654a187c24 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 26 Aug 2021 09:41:37 +0300
Subject: [PATCH 893/904] yadm: update to 3.1.1.

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

diff --git a/srcpkgs/yadm/template b/srcpkgs/yadm/template
index 9f8b63e4df26..d78edea1b83b 100644
--- a/srcpkgs/yadm/template
+++ b/srcpkgs/yadm/template
@@ -1,6 +1,6 @@
 # Template file for 'yadm'
 pkgname=yadm
-version=3.1.0
+version=3.1.1
 revision=1
 depends="bash git gnupg"
 short_desc="Yet Another Dotfiles Manager"
@@ -8,7 +8,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://yadm.io/"
 distfiles="https://github.com/TheLocehiliosan/yadm/archive/${version}.tar.gz"
-checksum=9f848c80deed2725c012d058bd60d1ea13539fd6fbacd5245bf97d442cb89263
+checksum=2c7c99bfbea61701aa2bf423caa4e4b2687c3f2d1898de6ca1a17167443730ab
 
 do_install() {
 	vbin yadm

From 8304f6730be0e5aedfae93bf8a21e79d211e707b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 26 Aug 2021 13:44:29 -0400
Subject: [PATCH 894/904] starship: update to 0.57.0

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

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index ff5c63a24732..6958a023b61b 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,6 +1,6 @@
 # Template file for 'starship'
 pkgname=starship
-version=0.56.0
+version=0.57.0
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -13,7 +13,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="ISC"
 homepage="https://starship.rs"
 distfiles="https://github.com/starship/starship/archive/refs/tags/v${version}.tar.gz"
-checksum=ab038a2cc1ea0b6c6ebbf064f531f22448ee1ed8d04b5f25b327ead1ad22cca5
+checksum=fba20e4ea3c11cc06d50d7fb8422242f420085e109a46e37b4ed8cd51b514b81
 
 post_build() {
 	STARSHIP="target/${RUST_TARGET}/release/starship"

From 7cd1acd7b68b6b7758356be003702e7c30abf908 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Jul 2021 01:04:48 +0200
Subject: [PATCH 895/904] hooks/post-install: add fix permissions hook

---
 Manual.md                                     |  4 +++
 common/environment/setup-subpkg/subpkg.sh     |  3 ++
 .../hooks/post-install/14-fix-permissions.sh  | 33 +++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 common/hooks/post-install/14-fix-permissions.sh

diff --git a/Manual.md b/Manual.md
index 33706f20c210..db605c52135f 100644
--- a/Manual.md
+++ b/Manual.md
@@ -762,6 +762,10 @@ Examples:
 	```
 A special value `noarch` used to be available, but has since been removed.
 
+- `nocheckperms` If set, xbps-src will not fail on common permission errors (world writable files, etc.)
+
+- `nofixperms` If set, xbps-src will not fix common permission errors (executable manpages, etc.)
+
 <a id="explain_depends"></a>
 #### About the many types of `depends` variables
 
diff --git a/common/environment/setup-subpkg/subpkg.sh b/common/environment/setup-subpkg/subpkg.sh
index 0243d2400481..6edab5d882e1 100644
--- a/common/environment/setup-subpkg/subpkg.sh
+++ b/common/environment/setup-subpkg/subpkg.sh
@@ -8,6 +8,9 @@ unset -v depends run_depends replaces provides conflicts tags
 # hooks/post-install/03-strip-and-debug-pkgs
 unset -v nostrip nostrip_files
 
+# hooks/post-install/14-fix-permissions
+unset -v nocheckperms nofixperms
+
 # hooks/pre-pkg/04-generate-runtime-deps
 unset -v noverifyrdeps skiprdeps allow_unknown_shlibs shlib_requires
 
diff --git a/common/hooks/post-install/14-fix-permissions.sh b/common/hooks/post-install/14-fix-permissions.sh
new file mode 100644
index 000000000000..57b76ae9f485
--- /dev/null
+++ b/common/hooks/post-install/14-fix-permissions.sh
@@ -0,0 +1,33 @@
+# This hook fixes permissions in common places
+
+change_file_perms() {
+	local dir="${PKGDESTDIR}${1}"
+	# permission mask for matching the files
+	local permmask="$2"
+	# permissions which will be set on matched files
+	local perms="$3"
+	if [ -d "$dir" ]; then
+		find "$dir" -type f -perm "/$permmask" -exec chmod -v "$perms" {} +
+	fi
+}
+
+hook() {
+	if [ -z "$nocheckperms" ]; then
+		# check that no files have permission write for all users
+		find "$PKGDESTDIR" -type f -perm -0002 | while read -r file; do
+			msg_error "$pkgver: file ${file#$PKGDESTDIR} has write permission for all users\n"
+		done
+	fi
+
+	if [ -z "$nofixperms" ]; then
+		change_file_perms "/usr/share/man" 133 644
+		change_file_perms "/etc/apparmor.d" 111 644
+		change_file_perms "/usr/share/applications" 133 644
+		change_file_perms "/usr/share/help" 133 644
+		change_file_perms "/usr/share/icons" 133 644
+		change_file_perms "/usr/share/locale" 133 644
+		change_file_perms "/usr/share/metainfo" 133 644
+		change_file_perms "/usr/share/appdata" 133 644
+		change_file_perms "/usr/include" 133 644
+	fi
+}

From 2e4ff07b9bbca349f13abf7a2563b72ca9e2401f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 Aug 2021 13:13:01 +0200
Subject: [PATCH 896/904] python3-simplegeneric: fix permissions

---
 srcpkgs/python3-simplegeneric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-simplegeneric/template b/srcpkgs/python3-simplegeneric/template
index 1d52210254c4..e5972608a2a3 100644
--- a/srcpkgs/python3-simplegeneric/template
+++ b/srcpkgs/python3-simplegeneric/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simplegeneric'
 pkgname=python3-simplegeneric
 version=0.8.1
-revision=6
+revision=7
 wrksrc="simplegeneric-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools"
@@ -12,3 +12,7 @@ license="ZPL-2.1"
 homepage="https://pypi.org/project/simplegeneric/"
 distfiles="${PYPI_SITE}/s/simplegeneric/simplegeneric-${version}.zip"
 checksum=dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173
+
+post_install() {
+	chmod -R o-w ${DESTDIR}/usr/lib/python*/site-packages/*.egg-info/
+}

From ea8b62a81dd7fc4daefb26535e593a9d5ffad048 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 Aug 2021 13:14:01 +0200
Subject: [PATCH 897/904] python3-olefile: fix permissions

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

diff --git a/srcpkgs/python3-olefile/template b/srcpkgs/python3-olefile/template
index d76ec0ee8adc..4213ca32532f 100644
--- a/srcpkgs/python3-olefile/template
+++ b/srcpkgs/python3-olefile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-olefile'
 pkgname=python3-olefile
 version=0.46
-revision=4
+revision=5
 wrksrc="olefile-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools"
@@ -14,5 +14,6 @@ distfiles="${PYPI_SITE}/o/olefile/olefile-${version}.zip"
 checksum=133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964
 
 post_install() {
+	chmod -R o-w ${DESTDIR}/usr/lib/python*/site-packages/*.egg-info/
 	vlicense LICENSE.txt
 }

From 7648cf361c3b821d581af0873427ad1756f2b62b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 Aug 2021 13:16:40 +0200
Subject: [PATCH 898/904] brother-brscan3: fix permissions

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

diff --git a/srcpkgs/brother-brscan3/template b/srcpkgs/brother-brscan3/template
index 38bf432986e9..4ca8965c65a3 100644
--- a/srcpkgs/brother-brscan3/template
+++ b/srcpkgs/brother-brscan3/template
@@ -1,7 +1,7 @@
 # Template file for 'brother-brscan3'
 pkgname=brother-brscan3
 version=0.2.13
-revision=1
+revision=2
 archs="i686 x86_64"
 create_wrksrc=yes
 hostmakedepends="tar"
@@ -44,6 +44,7 @@ do_install() {
 	ln -sf /usr/lib/libbrscandec3.so.1.0.0 ${DESTDIR}/usr/lib/libbrscandec3.so
 	vmkdir /opt/Brother
 	vcopy "./usr/local/Brother/*" /opt/Brother/
+	chmod o-w ${DESTDIR}/opt/Brother/sane/brsanenetdevice3.cfg
 	vlicense LICENSE
 }
 

From f80bb11f2fa79d6b99ca1be9d87c6762b802a4eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 Aug 2021 13:18:24 +0200
Subject: [PATCH 899/904] heyu: fix permissions

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

diff --git a/srcpkgs/heyu/template b/srcpkgs/heyu/template
index 93b3ad7cc582..2537b473e4fa 100644
--- a/srcpkgs/heyu/template
+++ b/srcpkgs/heyu/template
@@ -1,7 +1,7 @@
 # Template file for 'heyu'
 pkgname=heyu
 version=2.10.1
-revision=3
+revision=4
 build_style=configure
 configure_script="./Configure"
 configure_args="linux"
@@ -26,7 +26,7 @@ do_install() {
 	vbin heyu
 
 	vmkdir etc/heyu
-	vinstall x10config.sample 0666 etc/heyu x10.conf
+	vinstall x10config.sample 0644 etc/heyu x10.conf
 
 	vman heyu.1
 	vman x10config.5

From 8285c86799872b2de8639a4fe41578be1dc68f8f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 Aug 2021 13:21:30 +0200
Subject: [PATCH 900/904] occt: fix permissions

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

diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 9298edc76e08..bbf04b932396 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -2,7 +2,7 @@
 pkgname=occt
 reverts=7.5.0_1
 version=7.4.0p1
-revision=3
+revision=4
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
 build_style=cmake
@@ -27,6 +27,7 @@ post_install() {
 
 	vmkdir /etc/profile.d
 	vinstall ${FILESDIR}/opencascade.sh 644 /etc/profile.d
+	chmod 755 ${DESTDIR}/usr/bin/draw.sh
 }
 
 occt-devel_package() {

From 95da48735328867c28be6c059fd4c93e5c6056a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 Aug 2021 14:40:25 +0200
Subject: [PATCH 901/904] vscode: fix permissions

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index a5cb2b02b284..da7d5cbe5bcf 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,7 +1,7 @@
 # Template file for 'vscode'
 pkgname=vscode
 version=1.59.1
-revision=1
+revision=2
 _electronver=12.0.14
 hostmakedepends="pkg-config python nodejs yarn tar git"
 makedepends="libxkbfile-devel libsecret-devel electron12"
@@ -66,4 +66,5 @@ do_install() {
 		-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
 		-i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
 	vlicense LICENSE.txt
+	chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
 }

From da05a17b978899b1256450f1301b5080f10de4fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 20:34:21 +0200
Subject: [PATCH 902/904] lbreakout2: do not check file permissions

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

diff --git a/srcpkgs/lbreakout2/template b/srcpkgs/lbreakout2/template
index 00eee1c29030..8368195ae4a2 100644
--- a/srcpkgs/lbreakout2/template
+++ b/srcpkgs/lbreakout2/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://lgames.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
 checksum=9104d6175553da3442dc6a5fc407a669e2f5aff3eedc5d30409eb003b7a78d6f
+nocheckperms=yes # uses a world-writable .hscr file for global leaderboard
 
 post_install() {
 	vinstall ${FILESDIR}/lbreakout2.desktop 644 usr/share/applications

From 4de3d0667ae1dc433079b1fc3422dba624f46095 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 20:34:41 +0200
Subject: [PATCH 903/904] lbreakouthd: do not check file permissions

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

diff --git a/srcpkgs/lbreakouthd/template b/srcpkgs/lbreakouthd/template
index 1f9accfb4ab9..cb9062e4f631 100644
--- a/srcpkgs/lbreakouthd/template
+++ b/srcpkgs/lbreakouthd/template
@@ -11,3 +11,4 @@ license="GPL-2.0-or-later"
 homepage="http://lgames.sourceforge.net/LBreakoutHD/"
 distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
 checksum=df5f8ad88bcf20bd34e1dfd77697b49a168d83ad43d8fdf5a3fee1fe272e15bd
+nocheckperms=yes # uses a world-writable .hscr file for global leaderboard

From 75022057a9a0e17fa09bdbdd9ea9fdbf32118fc5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 20:34:44 +0200
Subject: [PATCH 904/904] ltris: do not check file permissions

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

diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index b2484148df6b..98846feaac3b 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -12,4 +12,5 @@ license="GPL-2.0-or-later"
 homepage="http://lgames.sourceforge.net/index.php?project=LTris"
 distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
 checksum=0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8
+nocheckperms=yes # uses a world-writable .hscr file for global leaderboard
 CFLAGS+=" -fgnu89-inline"

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

* Re: New package: tut-0.0.28
  2021-08-27  8:23 [PR PATCH] New package: tut-0.0.28 NateDogg1232
  2021-08-27  9:14 ` [PR PATCH] [Updated] " NateDogg1232
  2021-08-27  9:15 ` [PR PATCH] [Closed]: " NateDogg1232
@ 2021-08-27  9:15 ` NateDogg1232
  2 siblings, 0 replies; 4+ messages in thread
From: NateDogg1232 @ 2021-08-27  9:15 UTC (permalink / raw)
  To: ml

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

New comment by NateDogg1232 on void-packages repository

https://github.com/void-linux/void-packages/pull/32699#issuecomment-907055248

Comment:
Ah shoot I tried to rebase and it failed. Let me close this pull request and figure out my local branch and try again later on

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

* Re: [PR PATCH] [Closed]: New package: tut-0.0.28
  2021-08-27  8:23 [PR PATCH] New package: tut-0.0.28 NateDogg1232
  2021-08-27  9:14 ` [PR PATCH] [Updated] " NateDogg1232
@ 2021-08-27  9:15 ` NateDogg1232
  2021-08-27  9:15 ` NateDogg1232
  2 siblings, 0 replies; 4+ messages in thread
From: NateDogg1232 @ 2021-08-27  9:15 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

New package: tut-0.0.28
https://github.com/void-linux/void-packages/pull/32699

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

end of thread, other threads:[~2021-08-27  9:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-27  8:23 [PR PATCH] New package: tut-0.0.28 NateDogg1232
2021-08-27  9:14 ` [PR PATCH] [Updated] " NateDogg1232
2021-08-27  9:15 ` [PR PATCH] [Closed]: " NateDogg1232
2021-08-27  9:15 ` NateDogg1232

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