Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] rust-sccache: update to 0.2.15
@ 2021-03-25 20:22 Logarithmus
  2021-03-25 20:28 ` ericonr
                   ` (34 more replies)
  0 siblings, 35 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-25 20:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 193fde6d2477fdd06ccbfb67dce9f597ae2769ef Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH] rust-sccache: update to 0.2.15

---
 srcpkgs/rust-sccache-dist     |  1 +
 srcpkgs/rust-sccache/template | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/rust-sccache-dist

diff --git a/srcpkgs/rust-sccache-dist b/srcpkgs/rust-sccache-dist
new file mode 120000
index 000000000000..c967e3f41a20
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist
@@ -0,0 +1 @@
+rust-sccache
\ No newline at end of file
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..4b65b41832d6 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,17 +1,18 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
+configure_args="--features dist-client,dist-server"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
@@ -19,5 +20,13 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
+	cargo update --package openssl-sys
+}
+
+rust-sccache-dist_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - distributed builds server"
+	pkg_install() {
+		vmove usr/bin/sccache-dist
+	}
 }

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

* Re: rust-sccache: update to 0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
@ 2021-03-25 20:28 ` ericonr
  2021-03-26 10:10 ` [PR PATCH] [Updated] " Logarithmus
                   ` (33 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-03-25 20:28 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-807427657

Comment:
Should be able to remove the cargo update command, since we are now on OpenSSL.

I don't think this needs a sub package, though.

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
  2021-03-25 20:28 ` ericonr
@ 2021-03-26 10:10 ` Logarithmus
  2021-03-26 21:28 ` Logarithmus
                   ` (32 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-26 10:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From fc985133f3f644110e2682638cdae69d8adff6a1 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH] rust-sccache: update to 0.2.15, add dist-server

---
 srcpkgs/rust-sccache-dist     |  1 +
 srcpkgs/rust-sccache/template | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/rust-sccache-dist

diff --git a/srcpkgs/rust-sccache-dist b/srcpkgs/rust-sccache-dist
new file mode 120000
index 000000000000..c967e3f41a20
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist
@@ -0,0 +1 @@
+rust-sccache
\ No newline at end of file
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..fe7d1da6c4b4 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,17 +1,19 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
+configure_args="--features dist-client,dist-server"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
+checkdepends="cargo"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
@@ -19,5 +21,13 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
+	cargo update --package openssl-sys
+}
+
+rust-sccache-dist_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - distributed builds server"
+	pkg_install() {
+		vmove usr/bin/sccache-dist
+	}
 }

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

* Re: rust-sccache: update to 0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
  2021-03-25 20:28 ` ericonr
  2021-03-26 10:10 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-03-26 21:28 ` Logarithmus
  2021-03-26 21:32 ` Logarithmus
                   ` (31 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-26 21:28 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-808517769

Comment:
```
running 1 test
test test_rust_cargo ... FAILED

failures:

---- test_rust_cargo stdout ----
thread 'test_rust_cargo' panicked at 'Failed to spawn "/usr/bin/cargo" "clean": No such file or directory (os error 2)', /host/cargo/registry/src/github.com-1ecc6299db9ec823/assert_cmd-1.0.2/src/assert.rs:63:17
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
```

Hmm...

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

* Re: rust-sccache: update to 0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (2 preceding siblings ...)
  2021-03-26 21:28 ` Logarithmus
@ 2021-03-26 21:32 ` Logarithmus
  2021-03-26 21:33 ` Logarithmus
                   ` (30 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-26 21:32 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-808519862

Comment:
> Should be able to remove the cargo update command, since we are now on OpenSSL.
> 
> I don't think this needs a sub package, though.

It definitely need a subpackage, because most users don't use distributed builds functionality. They just use local and/or S3 cache to speed up repeated builds. And `sccache-dist` binary is about `9 MiB`, which is quite a lot IMHO, considering that Void aims to be minimal/bloat-free distro.

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

* Re: rust-sccache: update to 0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (3 preceding siblings ...)
  2021-03-26 21:32 ` Logarithmus
@ 2021-03-26 21:33 ` Logarithmus
  2021-03-26 21:41 ` [PR PATCH] [Updated] rust-sccache: update to 0.2.15, enable dist-server feature Logarithmus
                   ` (29 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-26 21:33 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-808519862

Comment:
> Should be able to remove the cargo update command, since we are now on OpenSSL.
> 
> I don't think this needs a sub package, though.

It definitely need a subpackage, because most users don't use distributed builds functionality. They just use local and/or S3 cache to speed up repeated builds, for which `sccache` binary is sufficient. And `sccache-dist` binary is about `9 MiB`, which is quite a lot IMHO, considering that Void aims to be minimal/bloat-free distro.

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, enable dist-server feature
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (4 preceding siblings ...)
  2021-03-26 21:33 ` Logarithmus
@ 2021-03-26 21:41 ` Logarithmus
  2021-03-27 13:28 ` Logarithmus
                   ` (28 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-26 21:41 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, enable dist-server feature
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 6897d5818bd00a955c6f275c7679eac61b68224c Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH] rust-sccache: update to 0.2.15, enable dist-server feature

---
 srcpkgs/rust-sccache-dist     |  1 +
 srcpkgs/rust-sccache/template | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/rust-sccache-dist

diff --git a/srcpkgs/rust-sccache-dist b/srcpkgs/rust-sccache-dist
new file mode 120000
index 000000000000..c967e3f41a20
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist
@@ -0,0 +1 @@
+rust-sccache
\ No newline at end of file
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..f73be2161ffc 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,30 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
+configure_args="--features dist-client,dist-server"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ and more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
 
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
+rust-sccache-dist_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - server for distributed builds"
+	pkg_install() {
+		vmove usr/bin/sccache-dist
+	}
 }

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, enable dist-server feature
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (5 preceding siblings ...)
  2021-03-26 21:41 ` [PR PATCH] [Updated] rust-sccache: update to 0.2.15, enable dist-server feature Logarithmus
@ 2021-03-27 13:28 ` Logarithmus
  2021-03-27 15:05 ` Logarithmus
                   ` (27 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-27 13:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, enable dist-server feature
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From f588c6d9d63f823b10d147f8fa07a60d44f7e4f6 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH] rust-sccache: update to 0.2.15, enable dist-server feature

---
 srcpkgs/rust-sccache-dist     |  1 +
 srcpkgs/rust-sccache/template | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/rust-sccache-dist

diff --git a/srcpkgs/rust-sccache-dist b/srcpkgs/rust-sccache-dist
new file mode 120000
index 000000000000..c967e3f41a20
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist
@@ -0,0 +1 @@
+rust-sccache
\ No newline at end of file
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..73932f964ab7 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,31 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
+configure_args="--features dist-client,dist-server"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ and more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
 
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
+rust-sccache-dist_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	archs="x86_64*"
+	short_desc+=" - server for distributed builds"
+	pkg_install() {
+		vmove usr/bin/sccache-dist
+	}
 }

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, enable dist-server feature
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (6 preceding siblings ...)
  2021-03-27 13:28 ` Logarithmus
@ 2021-03-27 15:05 ` Logarithmus
  2021-03-27 15:06 ` Logarithmus
                   ` (26 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-27 15:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, enable dist-server feature
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 0e64baec25cecd0c8c1c98f5174e5ff8cd36c7b5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH 1/2] rust-sccache: update to 0.2.15

---
 srcpkgs/rust-sccache/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..a1f99a9aa87b 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,21 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkgconf"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 0c37669c7e30da50e6cbd1f8bcbde9b0a5e4fe0a Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sat, 27 Mar 2021 18:03:28 +0300
Subject: [PATCH 2/2] New package: rust-sccache-dist-0.2.15

---
 srcpkgs/rust-sccache-dist/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/rust-sccache-dist/template

diff --git a/srcpkgs/rust-sccache-dist/template b/srcpkgs/rust-sccache-dist/template
new file mode 100644
index 000000000000..7030127f5390
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist/template
@@ -0,0 +1,22 @@
+# Template file for 'rust-sccache-dist'
+pkgname=rust-sccache-dist
+version=0.2.15
+revision=1
+wrksrc="${pkgname/rust-/}-${version}"
+build_style=cargo
+configure_args="--no-default-features --features dist-server"
+hostmakedepends="pkgconf"
+makedepends="openssl-devel"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more - server for distributed builds"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://crates.io/crates/sccache"
+distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, enable dist-server feature
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (7 preceding siblings ...)
  2021-03-27 15:05 ` Logarithmus
@ 2021-03-27 15:06 ` Logarithmus
  2021-03-27 15:08 ` rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15 Logarithmus
                   ` (25 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-27 15:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, enable dist-server feature
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 0e64baec25cecd0c8c1c98f5174e5ff8cd36c7b5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH 1/2] rust-sccache: update to 0.2.15

---
 srcpkgs/rust-sccache/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..a1f99a9aa87b 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,21 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkgconf"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 2f877430e653c61a26f545d605a0539f275ca44c Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sat, 27 Mar 2021 18:03:28 +0300
Subject: [PATCH 2/2] New package: rust-sccache-dist-0.2.15

---
 srcpkgs/rust-sccache-dist/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/rust-sccache-dist/template

diff --git a/srcpkgs/rust-sccache-dist/template b/srcpkgs/rust-sccache-dist/template
new file mode 100644
index 000000000000..6ee77b2bcf42
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist/template
@@ -0,0 +1,23 @@
+# Template file for 'rust-sccache-dist'
+pkgname=rust-sccache-dist
+version=0.2.15
+revision=1
+archs="x86_64*"
+wrksrc="${pkgname/rust-/}-${version}"
+build_style=cargo
+configure_args="--no-default-features --features dist-server"
+hostmakedepends="pkgconf"
+makedepends="openssl-devel"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more - server for distributed builds"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://crates.io/crates/sccache"
+distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac

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

* Re: rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (8 preceding siblings ...)
  2021-03-27 15:06 ` Logarithmus
@ 2021-03-27 15:08 ` Logarithmus
  2021-03-27 15:09 ` [PR PATCH] [Updated] " Logarithmus
                   ` (24 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-27 15:08 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-808746875

Comment:
Turns out `sccache-dist` supports `x86_64` only. So instead of subpackage I decided to create a separate template.

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (9 preceding siblings ...)
  2021-03-27 15:08 ` rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15 Logarithmus
@ 2021-03-27 15:09 ` Logarithmus
  2021-03-27 15:10 ` Logarithmus
                   ` (23 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-27 15:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 0e64baec25cecd0c8c1c98f5174e5ff8cd36c7b5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH 1/2] rust-sccache: update to 0.2.15

---
 srcpkgs/rust-sccache/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..a1f99a9aa87b 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,21 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkgconf"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 73c96743c42f53133f212609877e4bed99cb01ff Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sat, 27 Mar 2021 18:03:28 +0300
Subject: [PATCH 2/2] New package: rust-sccache-dist-0.2.15

---
 srcpkgs/rust-sccache-dist/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/rust-sccache-dist/template

diff --git a/srcpkgs/rust-sccache-dist/template b/srcpkgs/rust-sccache-dist/template
new file mode 100644
index 000000000000..1dfb2dc28860
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist/template
@@ -0,0 +1,23 @@
+# Template file for 'rust-sccache-dist'
+pkgname=rust-sccache-dist
+version=0.2.15
+revision=1
+archs="x86_64*"
+wrksrc="sccache-${version}"
+build_style=cargo
+configure_args="--no-default-features --features dist-server"
+hostmakedepends="pkgconf"
+makedepends="openssl-devel"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more - server for distributed builds"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://crates.io/crates/sccache"
+distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac

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

* Re: rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (10 preceding siblings ...)
  2021-03-27 15:09 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-03-27 15:10 ` Logarithmus
  2021-03-27 19:14 ` Logarithmus
                   ` (22 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-27 15:10 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-808746875

Comment:
Turns out `sccache-dist` supports `x86_64` only. So instead of subpackage I decided to create a separate template for it.

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

* Re: rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (11 preceding siblings ...)
  2021-03-27 15:10 ` Logarithmus
@ 2021-03-27 19:14 ` Logarithmus
  2021-03-27 19:16 ` [PR PATCH] [Updated] " Logarithmus
                   ` (21 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-27 19:14 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-808519862

Comment:
> Should be able to remove the cargo update command, since we are now on OpenSSL.
> 
> I don't think this needs a sub package, though.

It definitely needs a subpackage, because most users don't use distributed builds functionality. They just use local and/or S3 cache to speed up repeated builds, for which `sccache` binary is sufficient. And `sccache-dist` binary is about `9 MiB`, which is quite a lot IMHO, considering that Void aims to be minimal/bloat-free distro.

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (12 preceding siblings ...)
  2021-03-27 19:14 ` Logarithmus
@ 2021-03-27 19:16 ` Logarithmus
  2021-04-01 17:33 ` Logarithmus
                   ` (20 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-03-27 19:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 0e64baec25cecd0c8c1c98f5174e5ff8cd36c7b5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH 1/2] rust-sccache: update to 0.2.15

---
 srcpkgs/rust-sccache/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..a1f99a9aa87b 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,21 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkgconf"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 1096039a477c36396b2ef9324bd89231b1a739c4 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sat, 27 Mar 2021 18:03:28 +0300
Subject: [PATCH 2/2] New package: rust-sccache-dist-0.2.15

---
 srcpkgs/rust-sccache-dist/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/rust-sccache-dist/template

diff --git a/srcpkgs/rust-sccache-dist/template b/srcpkgs/rust-sccache-dist/template
new file mode 100644
index 000000000000..2abc2a8f0315
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist/template
@@ -0,0 +1,27 @@
+# Template file for 'rust-sccache-dist'
+pkgname=rust-sccache-dist
+version=0.2.15
+revision=1
+archs="x86_64*"
+wrksrc="sccache-${version}"
+build_style=cargo
+configure_args="--no-default-features --features dist-server"
+hostmakedepends="pkgconf"
+makedepends="openssl-devel"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more - server for distributed builds"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://crates.io/crates/sccache"
+distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac
+
+post_install() {
+	rm ${DESTDIR}/usr/bin/sccache
+}

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (13 preceding siblings ...)
  2021-03-27 19:16 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-04-01 17:33 ` Logarithmus
  2021-04-01 17:34 ` Logarithmus
                   ` (19 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-04-01 17:33 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 0e64baec25cecd0c8c1c98f5174e5ff8cd36c7b5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH 1/2] rust-sccache: update to 0.2.15

---
 srcpkgs/rust-sccache/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..a1f99a9aa87b 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,21 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkgconf"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 35108f04681cf3e4efab4f47634ecfe0ee6d81d0 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sat, 27 Mar 2021 18:03:28 +0300
Subject: [PATCH 2/2] New package: rust-sccache-dist-0.2.15

---
 srcpkgs/rust-sccache-dist/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/rust-sccache-dist/template

diff --git a/srcpkgs/rust-sccache-dist/template b/srcpkgs/rust-sccache-dist/template
new file mode 100644
index 000000000000..2abc2a8f0315
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist/template
@@ -0,0 +1,27 @@
+# Template file for 'rust-sccache-dist'
+pkgname=rust-sccache-dist
+version=0.2.15
+revision=1
+archs="x86_64*"
+wrksrc="sccache-${version}"
+build_style=cargo
+configure_args="--no-default-features --features dist-server"
+hostmakedepends="pkgconf"
+makedepends="openssl-devel"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more - server for distributed builds"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://crates.io/crates/sccache"
+distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac
+
+post_install() {
+	rm ${DESTDIR}/usr/bin/sccache
+}

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (14 preceding siblings ...)
  2021-04-01 17:33 ` Logarithmus
@ 2021-04-01 17:34 ` Logarithmus
  2021-05-05 13:36 ` Logarithmus
                   ` (18 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-04-01 17:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 0e64baec25cecd0c8c1c98f5174e5ff8cd36c7b5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH 1/2] rust-sccache: update to 0.2.15

---
 srcpkgs/rust-sccache/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..a1f99a9aa87b 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,21 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkgconf"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 16396ae0cc4c5d288c52d2ceea308c393eeeb5a3 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sat, 27 Mar 2021 18:03:28 +0300
Subject: [PATCH 2/2] New package: rust-sccache-dist-0.2.15

---
 srcpkgs/rust-sccache-dist/template | 27 +++++++++++++++++++++++++++
 srcpkgs/rust-sccache/template      |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/rust-sccache-dist/template

diff --git a/srcpkgs/rust-sccache-dist/template b/srcpkgs/rust-sccache-dist/template
new file mode 100644
index 000000000000..2abc2a8f0315
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist/template
@@ -0,0 +1,27 @@
+# Template file for 'rust-sccache-dist'
+pkgname=rust-sccache-dist
+version=0.2.15
+revision=1
+archs="x86_64*"
+wrksrc="sccache-${version}"
+build_style=cargo
+configure_args="--no-default-features --features dist-server"
+hostmakedepends="pkgconf"
+makedepends="openssl-devel"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more - server for distributed builds"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://crates.io/crates/sccache"
+distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac
+
+post_install() {
+	rm ${DESTDIR}/usr/bin/sccache
+}
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index a1f99a9aa87b..0de9fbdf6ddf 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -4,6 +4,7 @@ version=0.2.15
 revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
+configure_args="--features all"
 hostmakedepends="pkgconf"
 makedepends="openssl-devel"
 checkdepends="cargo"

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

* Re: [PR PATCH] [Updated] rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (15 preceding siblings ...)
  2021-04-01 17:34 ` Logarithmus
@ 2021-05-05 13:36 ` Logarithmus
  2021-05-05 13:39 ` Logarithmus
                   ` (17 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Logarithmus @ 2021-05-05 13:36 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages sccache
https://github.com/void-linux/void-packages/pull/29756

rust-sccache: update to 0.2.15, new package: rust-sccache-dist-0.2.15
<!-- Mark items with [x] where applicable -->

I've updated `sccache` to 0.2.15 & added `rust-sccache-dist` as well.
`sccache-dist` is needed for distributed compilation of Rust, for example, pretty much like `distcc`.

#### 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.)
- [ ] 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/29756.patch is attached

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

From 0e64baec25cecd0c8c1c98f5174e5ff8cd36c7b5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 25 Mar 2021 23:18:42 +0300
Subject: [PATCH 0001/2024] rust-sccache: update to 0.2.15

---
 srcpkgs/rust-sccache/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..a1f99a9aa87b 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,21 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.13
-revision=3
+version=0.2.15
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkgconf"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 16396ae0cc4c5d288c52d2ceea308c393eeeb5a3 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sat, 27 Mar 2021 18:03:28 +0300
Subject: [PATCH 0002/2024] New package: rust-sccache-dist-0.2.15

---
 srcpkgs/rust-sccache-dist/template | 27 +++++++++++++++++++++++++++
 srcpkgs/rust-sccache/template      |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/rust-sccache-dist/template

diff --git a/srcpkgs/rust-sccache-dist/template b/srcpkgs/rust-sccache-dist/template
new file mode 100644
index 000000000000..2abc2a8f0315
--- /dev/null
+++ b/srcpkgs/rust-sccache-dist/template
@@ -0,0 +1,27 @@
+# Template file for 'rust-sccache-dist'
+pkgname=rust-sccache-dist
+version=0.2.15
+revision=1
+archs="x86_64*"
+wrksrc="sccache-${version}"
+build_style=cargo
+configure_args="--no-default-features --features dist-server"
+hostmakedepends="pkgconf"
+makedepends="openssl-devel"
+checkdepends="cargo"
+short_desc="Ccache-like tool for Rust, C/C++ & more - server for distributed builds"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://crates.io/crates/sccache"
+distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
+checksum=cd1b19d56224beccdbf3fcc1fac1b21d58ddad64eed7fc1288db84d227bcebf7
+make_check=extended
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac
+
+post_install() {
+	rm ${DESTDIR}/usr/bin/sccache
+}
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index a1f99a9aa87b..0de9fbdf6ddf 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -4,6 +4,7 @@ version=0.2.15
 revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
+configure_args="--features all"
 hostmakedepends="pkgconf"
 makedepends="openssl-devel"
 checkdepends="cargo"

From 48ee074824d9070ba674ff1a9ee19d94c3c3a2b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Mar 2021 11:24:04 +0100
Subject: [PATCH 0003/2024] netpbm: update to 10.93.03.

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

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c20e2e9a8d1e..cdbf0c34dcca 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,7 +1,7 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.93.02
+version=10.93.03
 revision=1
 _githash=a7fca291a0c78333da13e855bdb73aa819ba8649
 _githash_guide=db21e5ffa2830350c67547e3007c891ed75d9dac

From d1e3a42872e1980ef227346f3285a83a50205f10 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Mar 2021 11:30:40 +0100
Subject: [PATCH 0004/2024] emacs: update to 27.2.

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

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 97a994f626df..1cd4d18bd6aa 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=27.1
-revision=2
+version=27.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
@@ -24,8 +24,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/emacs/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41
-replaces="emacs>=0"
+checksum=b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9
 nocross=yes
 nopie=yes
 

From a6e49875ef5c75f8820877d10dc91d5fb952fbfa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Mar 2021 11:41:35 +0100
Subject: [PATCH 0005/2024] erlang: update to 23.3.

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index d45558762723..d60904161b5d 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.2.7
+version=23.3
 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=db84414c42ef5c9d472ddf780cad6f210c2344b22ecd59ca57527bf043ea0943
+checksum=a9dfe9ea762b9f06f67af6074bed0f75705e1f114b9c45634db7d7cac2a293da
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 046335ba406f25d12aea7741c23e1546a5e2a71e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Mar 2021 09:00:28 -0400
Subject: [PATCH 0006/2024] python3-pytools: update to 2021.2.1.

---
 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 146866452004..fe9083a702f4 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
+version=2021.2.1
 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=50f2d5b2196a18950fa1397d5ad7ea52daa5985e6196bfd06ba608a7caf93d07
+checksum=ebbcc38c7a30b1a0ce1a74816c85db9f2556bb4d5b9a71f85f5d88f69ddcb96b
 
 post_install() {
 	vlicense LICENSE

From 627dc9f651a427e942caae6db9fe9c1b18b7e8d6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Mar 2021 09:03:59 -0400
Subject: [PATCH 0007/2024] python3-cryptography_vectors: update to 3.4.7.

---
 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 6fcdffb4a5f4..ec4e2df05403 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.6
+version=3.4.7
 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=e5f88a5fb03d60b4f20eed4920638b6a3ed32a363523a77086528d557a2c2da8
+checksum=a7ac3aaa57514687696ad65f833e5e39b6fa3c5d41de2b8c938346ee119204c2
 
 post_install() {
 	vlicense LICENSE

From cf1826e2a4d54ad36fba315d182399d124f5dff2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Mar 2021 09:04:02 -0400
Subject: [PATCH 0008/2024] python3-cryptography: update to 3.4.7.

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

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 27fbe57203a0..a90520afa60d 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=3.4.6
-revision=2
+version=3.4.7
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
@@ -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=2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87
+checksum=3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 94ed72703695b53f764214fa9e9bf3e14941fc9e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Mar 2021 09:24:16 -0400
Subject: [PATCH 0009/2024] python3-scipy: update to 1.6.2.

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

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 7976bc003ce2..ca4f93158526 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=2800f47a5040cbab05b3ce58f1dfb670c70232b0f56d30380c6fd4ef4e787df5
+checksum=8fadc443044396283c48191d48e4e07a3c3b6e2ae320b1a56e76bb42929e84d2
 
 build_options="openblas"
 

From 77f039f4f377d5372d9056ff5d7e8a83df864d17 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 26 Mar 2021 16:41:32 +0100
Subject: [PATCH 0010/2024] linux5.4: update to 5.4.108.

---
 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 3d46e320dd43..5a37176c78d9 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.107
+version=5.4.108
 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=1c3cef545f366b56332c11c28d074c9d9148c28059a970ec8710826652237560
+checksum=f212ac07c21bd33e6898fdbb2ddba2a454f74578bbe7bef8fe4dbbbc0ec52172
 python_version=3
 patch_args="-Np1"
 

From ee3680cf1683e716001f13b64ef023becce4cff8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 26 Mar 2021 16:42:26 +0100
Subject: [PATCH 0011/2024] linux4.19: update to 4.19.183.

---
 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 aa1105c9992f..b569fe000864 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.182
+version=4.19.183
 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=05db750ba01ad557bef50835c253894fad9fb0db2224f0e803b25e2ff7ab2365
+checksum=bacfd95ddf51df70b2962fc685b5217fc449e644f16996e49d87eb259b84a5f5
 python_version=2 #unverified
 patch_args="-Np1"
 

From e50d1231268fafce7802880abb7fde5b3f2a59db Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 26 Mar 2021 21:25:29 +0400
Subject: [PATCH 0012/2024] mate-panel: update to 1.24.2.

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

diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template
index b8dc928e7039..8241e191d40c 100644
--- a/srcpkgs/mate-panel/template
+++ b/srcpkgs/mate-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-panel'
 pkgname=mate-panel
-version=1.24.1
+version=1.24.2
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94187a04b8b07393cbd43293b6ac4aeeacb9d586a4d726010ca07de560c67475
+checksum=30c5ba0392ec76b110220ee6d10bbdba76af36586592a6b3d604db70602848ea
 
 build_options="gir"
 build_options_default="gir"

From 487451b8b561e39412e07a0d79e803b8c4932237 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 26 Mar 2021 11:41:51 +0400
Subject: [PATCH 0013/2024] caja: update to 1.24.1.

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

diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index cd5f4a3af453..ef7f481d9502 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -1,6 +1,6 @@
 # Template file for 'caja'
 pkgname=caja
-version=1.24.0
+version=1.24.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,11 +14,11 @@ makedepends="exempi-devel gvfs-devel libXt-devel libexif-devel libnotify-devel
  mate-desktop-devel"
 depends="dbus gvfs mate-desktop mate-icon-theme"
 short_desc="MATE shell and file manager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80e17a55739561b213197f547cc1b30ca977206980cfa1e2d892331810f1ceb2
+checksum=e50b0147ce4c43107d4dadddafd2fa3928f7522515663b6bc58fef3016598f7a
 
 build_options="gir"
 build_options_default="gir"

From 3f190df1860700a58501c0f17bba950f59d34f68 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 26 Mar 2021 21:54:10 +0100
Subject: [PATCH 0014/2024] erlang: disable hipe for all ppc64

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index d60904161b5d..f02e96d48bc8 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -24,7 +24,7 @@ if [ -z "$CROSS_BUILD" ]; then
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" --disable-hipe" ;;
+	ppc64*|*-musl) configure_args+=" --disable-hipe" ;;
 esac
 
 pre_configure() {

From a74bb1ebd6c82c37d9e6d4368fe9cf880d9d5333 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Fri, 26 Mar 2021 18:48:57 -0700
Subject: [PATCH 0015/2024] linux5.4: Disable VFIO on arm*

---
 srcpkgs/linux5.4/files/arm-dotconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux5.4/files/arm-dotconfig b/srcpkgs/linux5.4/files/arm-dotconfig
index 0953e0c0054c..8c7dd0551235 100644
--- a/srcpkgs/linux5.4/files/arm-dotconfig
+++ b/srcpkgs/linux5.4/files/arm-dotconfig
@@ -5957,6 +5957,7 @@ CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VFIO is not set
 
 #
 # Microsoft Hyper-V guest support

From e37c709ad2e8cb6d7f6368339370c2609d9bdb0c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 27 Mar 2021 03:11:35 +0100
Subject: [PATCH 0016/2024] 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 fcf648a73a25..857125d15a5d 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.91 Kernel Configuration
+# Linux/powerpc 5.4.108 Kernel Configuration
 #
 
 #
@@ -5804,6 +5804,7 @@ CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
 # CONFIG_UIO_PRUSS is not set
 CONFIG_UIO_MF624=m
+# CONFIG_VFIO is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_MENU=y

From d2bc3635f68156702d35db4e84b326c161f9b329 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 21 Mar 2021 01:29:24 -0700
Subject: [PATCH 0017/2024] NetAuth: update to 0.4.1.

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

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index 426674112516..81a56aa405de 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
-version=0.3.4
-revision=5
+version=0.4.1
+revision=1
 wrksrc=netauth-$version
 build_style="go"
 go_import_path="github.com/netauth/netauth"
@@ -9,11 +9,11 @@ go_package="${go_import_path}/cmd/netauth
  ${go_import_path}/cmd/netauthd"
 hostmakedepends="git"
 short_desc="Network authentication and identity system"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/NetAuth/archive/v$version.tar.gz"
-checksum=76811411d4ebd00876e553b4eb9c912c16ee5ebc5c6aaeab922e233275f56a94
+checksum=0d68df48faa114a96c3e636fbfbd558fbac1f24f59f383be1449eec3a8101a4d
 
 do_check() {
 	go test -v ./...

From 520dbebc23e944f450bd9171a866c93f883b9491 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 21 Mar 2021 02:18:01 -0700
Subject: [PATCH 0018/2024] NetKeys: update to 0.5.5.

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

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 950d26850c4d..9d5c4a4385dc 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,6 +1,6 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
-version=0.5.3
+version=0.5.5
 revision=1
 wrksrc=netkeys-$version
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/NetKeys/archive/v$version.tar.gz"
-checksum=c7cdcc54a41501c3a40f114aa873668bb78c6ff2bd73c7a1c8c2295a968fc453
+checksum=1a82b2d415b77a63bd1cf7b2f79db454aea11811f268166dc004b75f38b9a791
 
 post_install() {
 	vlicense LICENSE

From 614ad488aaabed86a505e3727ef26d485d852907 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 21 Mar 2021 02:19:09 -0700
Subject: [PATCH 0019/2024] NetAuth-nsscache: update to 0.6.5.

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

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index a8aabcd5964a..b7d171889aaf 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,6 +1,6 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
-version=0.6.3
+version=0.6.5
 revision=1
 wrksrc="nsscache-$version"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/nsscache/archive/v$version.tar.gz"
-checksum=9e29b188166318e1d3aa4a2ddc00501c4419699ed812f34ea1fb73303f4fedfd
+checksum=d5e558d552009d59e5b433a9b96dac7db378412ccebb9dee95216a7a58eab2aa
 
 post_install() {
 	vlicense LICENSE

From 2af4bfeeac63f6125dbafb50cc24239e62798505 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 21 Mar 2021 02:25:13 -0700
Subject: [PATCH 0020/2024] NetAuth-localizer: update to 0.1.3.

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

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 4c97fb966b0d..7039dd37cbea 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,6 +1,6 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
-version=0.1.1
+version=0.1.3
 revision=1
 wrksrc=localizer-$version
 build_style=go
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://netauth.org/ecosystem/localizer"
 distfiles="https://github.com/netauth/localizer/archive/v$version.tar.gz"
-checksum=8a7f7b57f7bdb751f9a6b482603b0207577ae54c1e79cb0f7dd8e96730fbdb84
+checksum=63c4d462f90e03b8f4e225afe8cd064fdb54cf1d646c8ec4ff2452dbe2ad55f5
 
 do_check() {
 	go test -v ./...

From 5342d52ac81417546d33bac1dd65ec02a65cdb07 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 21 Mar 2021 02:52:30 -0700
Subject: [PATCH 0021/2024] NetAuth-ldap: update to 0.2.3.

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

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index 425ccf490792..ef3429113f67 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,6 +1,6 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
-version=0.2.0
+version=0.2.3
 revision=1
 wrksrc=ldap-$version
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://www.netauth.org/ecosystem/ldap"
 distfiles="https://github.com/netauth/ldap/archive/v$version.tar.gz"
-checksum=581b60475e940efff673edd3a0fb5ab34fef28f4872fc51a0720013f2004c2f0
+checksum=1d75f23197ea869207e8895cfaadde2c536f279eb26ddb8256642f5babece7e7
 system_accounts="_netauth_ldap"
 
 post_install() {

From 973657d2d429b85b01dae9836c33e519f8c40e45 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 21 Mar 2021 02:53:49 -0700
Subject: [PATCH 0022/2024] NetAuth-pam-helper: update to 0.1.5.

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

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 80f362a228eb..8c961a56b403 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,14 +1,18 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
-version=0.1.3
+version=0.1.5
 revision=1
 wrksrc=pam-helper-$version
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 hostmakedepends="git"
-short_desc="A helper executable to use with pam_exec"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+short_desc="Helper executable to use with pam_exec"
+maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://www.github.com/netauth/pam-helper"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=d9b14782a52604a0fc19ffe5164aad5e1580e3bdb015fda0c4b58acdb38049ae
+checksum=1f4fd5e914e6a423ba51911c89b105736b595a2328946e298a31e9dc144d1998
+
+post_install() {
+	vlicense LICENSE
+}

From e40324e869e6e4430e901e2446c01f3a9af7fbdf Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 21 Mar 2021 02:56:02 -0700
Subject: [PATCH 0023/2024] pam_netauth: update to 0.3.5.

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

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index 44bad9699dc5..09a33291eb8e 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,6 +1,6 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
-version=0.3.3
+version=0.3.5
 revision=1
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/pam_netauth/archive/v$version.tar.gz"
-checksum=974bec19c5c50181e72c3cc1ab3089a5d37a753a7147d432dc7d44caa7dfd9f6
+checksum=50e206ee9b542831e1f62e40817e6238d218c5dc95f6e854a9f4267c1e7a3341
 
 do_build() {
 	go build -x -o pam_netauth.so -buildmode=c-shared -ldflags "${go_ldflags}" ${go_import_path}

From 2617be05744be458ff6695eab3c4a5b3f44dfe05 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, 27 Mar 2021 10:48:07 +0700
Subject: [PATCH 0024/2024] chroot-git: update to 2.31.1.

---
 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 a1db8e146c16..d4cd9d8e6a5e 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,6 +1,6 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.30.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -8,13 +8,14 @@ build_style=gnu-configure
 configure_args="--without-curl --without-openssl
  --without-python --without-expat --without-tcltk
  ac_cv_lib_curl_curl_global_init=no ac_cv_lib_expat_XML_ParserCreate=no"
+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=55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl tar"

From 648b760c8086518f52d243b3d09a17cee825bd5f 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, 27 Mar 2021 10:47:51 +0700
Subject: [PATCH 0025/2024] git: update to 2.31.1.

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

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 115ce2fde63a..9aa14d60ce1d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.31.0
+version=2.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
@@ -14,7 +14,7 @@ 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=e8f162cbdb3283e13cd7388d864ed23485f1b046a19e969f12ed2685fb789a40
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 579a6cf8e017c23cd049cbf976125ace5b60402c 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, 27 Mar 2021 15:01:33 +0700
Subject: [PATCH 0026/2024] hiredis: fix pkg-config

---
 srcpkgs/hiredis/patches/fix-cflags.patch    | 16 +++++++++++++
 srcpkgs/hiredis/patches/fix-pkgconfig.patch | 26 +++++++++++++++++++++
 srcpkgs/hiredis/template                    |  3 ++-
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hiredis/patches/fix-cflags.patch
 create mode 100644 srcpkgs/hiredis/patches/fix-pkgconfig.patch

diff --git a/srcpkgs/hiredis/patches/fix-cflags.patch b/srcpkgs/hiredis/patches/fix-cflags.patch
new file mode 100644
index 000000000000..87521610b09a
--- /dev/null
+++ b/srcpkgs/hiredis/patches/fix-cflags.patch
@@ -0,0 +1,16 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -44,9 +44,9 @@ export REDIS_TEST_CONFIG
+ # Fallback to gcc when $CC is not in $PATH.
+ CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+-OPTIMIZATION?=-O3
++OPTIMIZATION?=
+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+-DEBUG_FLAGS?= -g -ggdb
++DEBUG_FLAGS?=
+ REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+ REAL_LDFLAGS=$(LDFLAGS)
+ 
diff --git a/srcpkgs/hiredis/patches/fix-pkgconfig.patch b/srcpkgs/hiredis/patches/fix-pkgconfig.patch
new file mode 100644
index 000000000000..3107ed35a96f
--- /dev/null
+++ b/srcpkgs/hiredis/patches/fix-pkgconfig.patch
@@ -0,0 +1,26 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -234,8 +234,8 @@ $(PKGCONFNAME): hiredis.h
+ 	@echo "Generating $@ for pkgconfig..."
+ 	@echo prefix=$(PREFIX) > $@
+ 	@echo exec_prefix=\$${prefix} >> $@
+-	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
+-	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
++	@echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@
++	@echo includedir=\$${prefix}/$(INCLUDE_PATH) >> $@
+ 	@echo >> $@
+ 	@echo Name: hiredis >> $@
+ 	@echo Description: Minimalistic C client library for Redis. >> $@
+@@ -247,8 +247,8 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h
+ 	@echo "Generating $@ for pkgconfig..."
+ 	@echo prefix=$(PREFIX) > $@
+ 	@echo exec_prefix=\$${prefix} >> $@
+-	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
+-	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
++	@echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@
++	@echo includedir=\$${prefix}/$(INCLUDE_PATH) >> $@
+ 	@echo >> $@
+ 	@echo Name: hiredis_ssl >> $@
+ 	@echo Description: SSL Support for hiredis. >> $@
diff --git a/srcpkgs/hiredis/template b/srcpkgs/hiredis/template
index 15da33a9c7c9..05e5d6cf565f 100644
--- a/srcpkgs/hiredis/template
+++ b/srcpkgs/hiredis/template
@@ -1,8 +1,9 @@
 # Template file for 'hiredis'
 pkgname=hiredis
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
+make_build_args="PREFIX=/usr"
 checkdepends="redis"
 short_desc="Minimalistic C client for Redis"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 044e0b79cbed3549855409618e800c185b81f665 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 19:59:09 +0100
Subject: [PATCH 0027/2024] libvpx6: update to 1.10.0.

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

diff --git a/srcpkgs/libvpx6/template b/srcpkgs/libvpx6/template
index a929b3ebcc20..cde8810988b2 100644
--- a/srcpkgs/libvpx6/template
+++ b/srcpkgs/libvpx6/template
@@ -1,6 +1,6 @@
 # Template file for 'libvpx6'
 pkgname=libvpx6
-version=1.9.0
+version=1.10.0
 revision=1
 wrksrc=libvpx-${version}
 hostmakedepends="perl yasm"
@@ -9,7 +9,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="BSD-3-Clause-Clear"
 homepage="http://www.webmproject.org"
 distfiles="https://github.com/webmproject/libvpx/archive/v${version}.tar.gz"
-checksum=d279c10e4b9316bf11a570ba16c3d55791e1ad6faa4404c67422eb631782c80a
+checksum=85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a
 replaces="libvpx<1.8.0"
 
 do_configure() {

From 93cc9cc29fb271622877ced179dc67b07d6a9455 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:06:52 +0100
Subject: [PATCH 0028/2024] telegram-desktop: update to 2.6.1.

---
 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 5778f4c2d76a..7cd6ff771584 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.5.1
-revision=2
+version=2.6.1
+revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"
@@ -26,7 +26,7 @@ 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=f1cc5e876deaa4fa4eaafbba95f127d5a3114c166802902b8584099852b9eae2
+checksum=c7878c4d7c621a175b3b27895b3fb8c20a56319214d5030d734b2768390a8b73
 
 build_options="spellcheck webrtc"
 build_options_default="spellcheck webrtc"

From 3554ed4edf08bd0e914aa0627c1c08b50cf1f53a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:17:37 +0100
Subject: [PATCH 0029/2024] tg_owt: update to 0.0.0.20210203.

---
 srcpkgs/tg_owt/patches/libressl.patch      | 70 ----------------------
 srcpkgs/tg_owt/patches/libressl.patch.args |  1 -
 srcpkgs/tg_owt/template                    |  9 ++-
 3 files changed, 4 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tg_owt/patches/libressl.patch
 delete mode 100644 srcpkgs/tg_owt/patches/libressl.patch.args

diff --git a/srcpkgs/tg_owt/patches/libressl.patch b/srcpkgs/tg_owt/patches/libressl.patch
deleted file mode 100644
index fc352a2a64c2..000000000000
--- a/srcpkgs/tg_owt/patches/libressl.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 3f2d8238846d4795f1292c05923b9f212dc4d022 Mon Sep 17 00:00:00 2001
-From: Charlie Li <git@vishwin.info>
-Date: Sat, 21 Nov 2020 14:24:04 -0500
-Subject: [PATCH] Fix build with LibreSSL
-
-LibreSSL's dtls1.h uses some definitions from ssl.h and ssl3.h, but
-expects consumers to include them. Reorder and include them before
-dtls1.h.
-
-LibreSSL does not define DTLS1_2_VERSION. Remove them from view.
----
- src/rtc_base/openssl_stream_adapter.cc | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/rtc_base/openssl_stream_adapter.cc b/src/rtc_base/openssl_stream_adapter.cc
-index 7f4b79a5..037002bc 100644
---- a/src/rtc_base/openssl_stream_adapter.cc
-+++ b/src/rtc_base/openssl_stream_adapter.cc
-@@ -17,8 +17,11 @@
- #include <openssl/tls1.h>
- #include <openssl/x509v3.h>
- #ifndef OPENSSL_IS_BORINGSSL
--#include <openssl/dtls1.h>
- #include <openssl/ssl.h>
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#include <openssl/ssl3.h>
-+#endif
-+#include <openssl/dtls1.h>
- #endif
- 
- #include <memory>
-@@ -392,8 +395,10 @@ SSLProtocolVersion OpenSSLStreamAdapter::GetSslVersion() const {
-   if (ssl_mode_ == SSL_MODE_DTLS) {
-     if (ssl_version == DTLS1_VERSION) {
-       return SSL_PROTOCOL_DTLS_10;
-+#ifndef LIBRESSL_VERSION_NUMBER
-     } else if (ssl_version == DTLS1_2_VERSION) {
-       return SSL_PROTOCOL_DTLS_12;
-+#endif
-     }
-   } else {
-     if (ssl_version == TLS1_VERSION) {
-@@ -985,15 +990,27 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() {
-       case SSL_PROTOCOL_TLS_12:
-       default:
-         SSL_CTX_set_max_proto_version(
-+#ifdef LIBRESSL_VERSION_NUMBER
-+            ctx, TLS1_2_VERSION);
-+#else
-             ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
-+#endif
-         break;
-     }
-   } else {
-     // TODO(https://bugs.webrtc.org/10261): Make this the default in M84.
-     SSL_CTX_set_min_proto_version(
-+#ifdef LIBRESSL_VERSION_NUMBER
-+        ctx, TLS1_2_VERSION);
-+#else
-         ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
-+#endif
-     SSL_CTX_set_max_proto_version(
-+#ifdef LIBRESSL_VERSION_NUMBER
-+        ctx, TLS1_2_VERSION);
-+#else
-         ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
-+#endif
-   }
- 
- #ifdef OPENSSL_IS_BORINGSSL
diff --git a/srcpkgs/tg_owt/patches/libressl.patch.args b/srcpkgs/tg_owt/patches/libressl.patch.args
deleted file mode 100644
index 2eba1cb3c5ce..000000000000
--- a/srcpkgs/tg_owt/patches/libressl.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index fa0d55fc4aec..b63fd17281a4 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,9 +1,8 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
-version=0.0.0.1
-revision=2
-_commit=756fd0fb5f40ffb4244c675208e84de781f766f3
-_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
+version=0.0.0.20210321
+revision=1
+_commit=2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
@@ -18,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/desktop-app/tg_owt"
 distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
  https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz"
-checksum="@43d09b00a43f9206b1f04c6d6697f4b0cb3be0285100bf5df91144b1d689c89a
+checksum="@2873f3c9a6e5a93976623d4502af59bf6c8a3536aa9928acf45cea0a20e23ec0
  @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
 skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"
 

From 98034c6564830e6d582a69a13b989835e05207d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 20:55:31 +0100
Subject: [PATCH 0030/2024] telegram-desktop: update to 2.7.1.

---
 .../patches/0002-use-vendored-gsl.patch       | 11 +++
 .../patches/0003-stdint.patch                 | 10 ++
 ...bca53a1e195a31760978dc41f67ce44fc7e4.patch | 22 +++++
 ...148bafc27f35011b805e773993300c55713f.patch | 84 ++++++++++++++++
 .../patches/no-webrtc-build.patch             | 96 -------------------
 srcpkgs/telegram-desktop/template             | 13 ++-
 6 files changed, 133 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-stdint.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/3582bca53a1e195a31760978dc41f67ce44fc7e4.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/c08a148bafc27f35011b805e773993300c55713f.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/no-webrtc-build.patch

diff --git a/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch b/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch
new file mode 100644
index 000000000000..dfb0d743d8f5
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch
@@ -0,0 +1,11 @@
+--- cmake/external/gsl/CMakeLists.txt	2021-03-17 10:33:50.000000000 +0100
++++ -	2021-03-21 21:08:36.925095597 +0100
+@@ -8,7 +8,7 @@
+ add_library(desktop-app::external_gsl ALIAS external_gsl)
+ 
+ if (DESKTOP_APP_USE_PACKAGED)
+-    if (DESKTOP_APP_USE_PACKAGED_LAZY)
++    if (TRUE)
+         find_package(Microsoft.GSL QUIET)
+     else()
+         find_package(Microsoft.GSL)
diff --git a/srcpkgs/telegram-desktop/patches/0003-stdint.patch b/srcpkgs/telegram-desktop/patches/0003-stdint.patch
new file mode 100644
index 000000000000..e73238fc0341
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-stdint.patch
@@ -0,0 +1,10 @@
+--- Telegram/ThirdParty/tgcalls/tgcalls/group/StreamingPart.h	2021-03-17 21:29:27.000000000 +0100
++++ -	2021-03-21 21:11:50.643605199 +0100
+@@ -3,6 +3,7 @@
+ 
+ #include "absl/types/optional.h"
+ #include <vector>
++#include <cstdint>
+ 
+ namespace tgcalls {
+ 
diff --git a/srcpkgs/telegram-desktop/patches/3582bca53a1e195a31760978dc41f67ce44fc7e4.patch b/srcpkgs/telegram-desktop/patches/3582bca53a1e195a31760978dc41f67ce44fc7e4.patch
new file mode 100644
index 000000000000..585e35b49cf3
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/3582bca53a1e195a31760978dc41f67ce44fc7e4.patch
@@ -0,0 +1,22 @@
+From 3582bca53a1e195a31760978dc41f67ce44fc7e4 Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Mon, 22 Mar 2021 18:56:15 +0400
+Subject: [PATCH] Fix build on 32-bit systems
+
+---
+ base/platform/linux/base_last_input_linux.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/base/platform/linux/base_last_input_linux.cpp b/base/platform/linux/base_last_input_linux.cpp
+index c51d890..b20bd03 100644
+--- Telegram/lib_base/base/platform/linux/base_last_input_linux.cpp
++++ Telegram/lib_base/base/platform/linux/base_last_input_linux.cpp
+@@ -135,7 +135,7 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
+ 			{},
+ 			"org.gnome.Mutter.IdleMonitor");
+ 
+-		const auto value = GlibVariantCast<ulong>(reply.get_child(0));
++		const auto value = GlibVariantCast<uint>(reply.get_child(0));
+ 		return (crl::now() - static_cast<crl::time>(value));
+ 	} catch (const Glib::Error &e) {
+ 		static const auto NotSupportedErrors = {
diff --git a/srcpkgs/telegram-desktop/patches/c08a148bafc27f35011b805e773993300c55713f.patch b/srcpkgs/telegram-desktop/patches/c08a148bafc27f35011b805e773993300c55713f.patch
new file mode 100644
index 000000000000..e8cc81c0a1fc
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/c08a148bafc27f35011b805e773993300c55713f.patch
@@ -0,0 +1,84 @@
+From c08a148bafc27f35011b805e773993300c55713f Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Tue, 23 Mar 2021 18:27:13 +0400
+Subject: [PATCH] Fix build on 32-bit systems
+
+---
+ .../platform/linux/linux_mpris_support.cpp           | 12 ++++++------
+ .../SourceFiles/platform/linux/main_window_linux.cpp |  4 ++--
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git Telegram/SourceFiles/platform/linux/linux_mpris_support.cpp Telegram/SourceFiles/platform/linux/linux_mpris_support.cpp
+index 3a3d05a1324..339ae554ef8 100644
+--- Telegram/SourceFiles/platform/linux/linux_mpris_support.cpp
++++ Telegram/SourceFiles/platform/linux/linux_mpris_support.cpp
+@@ -96,7 +96,7 @@ auto CreateMetadata(const Media::Player::TrackState &state) {
+ 	if (!Media::Player::IsStoppedOrStopping(state.state)) {
+ 		result["mpris:trackid"] = Glib::wrap(g_variant_new_object_path(
+ 			kFakeTrackPath.utf8().constData()));
+-		result["mpris:length"] = Glib::Variant<long>::create(
++		result["mpris:length"] = Glib::Variant<gint64>::create(
+ 			state.length * 1000);
+ 
+ 		const auto audioData = state.id.audio();
+@@ -159,7 +159,7 @@ void HandleMethodCall(
+ 			} else if (method_name == "Previous") {
+ 				Media::Player::instance()->previous();
+ 			} else if (method_name == "Seek") {
+-				const auto offset = base::Platform::GlibVariantCast<long>(
++				const auto offset = base::Platform::GlibVariantCast<gint64>(
+ 					parametersCopy.get_child(0));
+ 
+ 				const auto state = Media::Player::instance()->getState(
+@@ -170,7 +170,7 @@ void HandleMethodCall(
+ 					float64(state.position * 1000 + offset)
+ 						/ (state.length * 1000));
+ 			} else if (method_name == "SetPosition") {
+-				const auto position = base::Platform::GlibVariantCast<long>(
++				const auto position = base::Platform::GlibVariantCast<gint64>(
+ 					parametersCopy.get_child(1));
+ 
+ 				const auto state = Media::Player::instance()->getState(
+@@ -251,7 +251,7 @@ void HandleGetProperty(
+ 			const auto state = Media::Player::instance()->getState(
+ 				kSongType);
+ 
+-			property = Glib::Variant<long>::create(state.position * 1000);
++			property = Glib::Variant<gint64>::create(state.position * 1000);
+ 		} else if (property_name == "Rate") {
+ 			property = Glib::Variant<float64>::create(1.0);
+ 		} else if (property_name == "Volume") {
+@@ -315,7 +315,7 @@ void PlayerPropertyChanged(
+ 	}
+ }
+ 
+-void Seeked(long position) {
++void Seeked(gint64 position) {
+ 	try {
+ 		const auto connection = Gio::DBus::Connection::get_sync(
+ 			Gio::DBus::BusType::BUS_TYPE_SESSION);
+@@ -348,7 +348,7 @@ class MPRISSupport::Private {
+ 
+ 	std::map<Glib::ustring, Glib::VariantBase> metadata;
+ 	Glib::ustring playbackStatus;
+-	long position = 0;
++	gint64 position = 0;
+ 
+ 	rpl::lifetime lifetime;
+ };
+diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+index 139667ea6ff..624e5107a02 100644
+--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp
++++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+@@ -880,9 +880,9 @@ void MainWindow::updateIconCounters() {
+ 
+ 		if (counterSlice > 0) {
+ 			// According to the spec, it should be of 'x' D-Bus signature,
+-			// which corresponds to gint64 (signed long) type with glib
++			// which corresponds to gint64 type with glib
+ 			// https://wiki.ubuntu.com/Unity/LauncherAPI#Low_level_DBus_API:_com.canonical.Unity.LauncherEntry
+-			dbusUnityProperties["count"] = Glib::Variant<long>::create(
++			dbusUnityProperties["count"] = Glib::Variant<gint64>::create(
+ 				counterSlice);
+ 			dbusUnityProperties["count-visible"] =
+ 				Glib::Variant<bool>::create(true);
diff --git a/srcpkgs/telegram-desktop/patches/no-webrtc-build.patch b/srcpkgs/telegram-desktop/patches/no-webrtc-build.patch
deleted file mode 100644
index 3d8ab8f98272..000000000000
--- a/srcpkgs/telegram-desktop/patches/no-webrtc-build.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
-index e99958109..bb7678d3c 100644
---- Telegram/SourceFiles/calls/calls_instance.cpp
-+++ Telegram/SourceFiles/calls/calls_instance.cpp
-@@ -350,8 +350,11 @@ std::shared_ptr<tgcalls::VideoCaptureInterface> Instance::getVideoCapture() {
- 		return result;
- 	}
- 	auto result = std::shared_ptr<tgcalls::VideoCaptureInterface>(
-+		#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
- 		tgcalls::VideoCaptureInterface::Create(
--			Core::App().settings().callVideoInputDeviceId().toStdString()));
-+			Core::App().settings().callVideoInputDeviceId().toStdString())
-+		#endif
-+		);
- 	_videoCapture = result;
- 	return result;
- }
-diff --git Telegram/lib_webrtc/CMakeLists.txt b/CMakeLists.txt
-index 47796f1..1f54c21 100644
---- Telegram/lib_webrtc/CMakeLists.txt
-+++ Telegram/lib_webrtc/CMakeLists.txt
-@@ -14,8 +14,10 @@ target_precompile_headers(lib_webrtc PRIVATE ${src_loc}/webrtc/webrtc_pch.h)
- nice_target_sources(lib_webrtc ${src_loc}
- PRIVATE
-     webrtc/webrtc_audio_input_tester.cpp
-+    webrtc/webrtc_audio_input_tester_dummy.cpp
-     webrtc/webrtc_audio_input_tester.h
-     webrtc/webrtc_media_devices.cpp
-+    webrtc/webrtc_media_devices_dummy.cpp
-     webrtc/webrtc_media_devices.h
-     webrtc/webrtc_video_track.cpp
-     webrtc/webrtc_video_track.h
-@@ -40,10 +42,14 @@ PUBLIC
- if (DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION)
-     remove_target_sources(lib_webrtc ${src_loc}
-         webrtc/webrtc_video_track.cpp
-+	webrtc/webrtc_media_devices.cpp
-+	webrtc/webrtc_audio_input_tester.cpp
-     )
- else()
-     remove_target_sources(lib_webrtc ${src_loc}
-         webrtc/webrtc_video_track_dummy.cpp
-+	webrtc/webrtc_media_devices_dummy.cpp
-+	webrtc/webrtc_audio_input_tester_dummy.cpp
-     )
-     target_link_libraries(lib_webrtc
-     PRIVATE
-diff --git Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h b/webrtc/webrtc_audio_input_tester.h
-index 1ae8d30..008df7e 100644
---- Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h
-+++ Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h
-@@ -20,11 +20,13 @@ public:
- 	[[nodiscard]] float getAndResetLevel();
- 
- private:
-+#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
- 	class Impl;
--
-+#endif
- 	std::shared_ptr<std::atomic<int>> _maxSample;
-+#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
- 	crl::object_on_thread<Impl> _impl;
--
-+#endif
- };
- 
- } // namespace Webrtc
-diff --git Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester_dummy.cpp b/webrtc/webrtc_audio_input_tester_dummy.cpp
-new file mode 100644
-index 0000000..4e47eaa
---- /dev/null
-+++ Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester_dummy.cpp
-@@ -0,0 +1,11 @@
-+#include "webrtc/webrtc_audio_input_tester.h"
-+
-+namespace Webrtc {
-+AudioInputTester::AudioInputTester(const QString &deviceId)
-+: _maxSample(std::make_shared<std::atomic<int>>(0)) {}
-+AudioInputTester::~AudioInputTester() {}
-+void AudioInputTester::setDeviceId(const QString &deviceId) {};
-+float AudioInputTester::getAndResetLevel() {
-+	return _maxSample->exchange(0) / float(INT16_MAX);\
-+}
-+}
-diff --git Telegram/lib_webrtc/webrtc/webrtc_media_devices_dummy.cpp b/webrtc/webrtc_media_devices_dummy.cpp
-new file mode 100644
-index 0000000..8d5d245
---- /dev/null
-+++ Telegram/lib_webrtc/webrtc/webrtc_media_devices_dummy.cpp
-@@ -0,0 +1,6 @@
-+#include "webrtc/webrtc_media_devices.h"
-+namespace Webrtc {
-+std::vector<VideoInput> GetVideoInputList() { return std::vector<VideoInput>(); };
-+std::vector<AudioInput> GetAudioInputList() { return std::vector<AudioInput>(); };
-+std::vector<AudioOutput> GetAudioOutputList() { return std::vector<AudioOutput>(); };
-+}
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 7cd6ff771584..9f74895d695c 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.6.1
+version=2.7.1
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -10,15 +10,14 @@ configure_args="-DTDESKTOP_API_ID=209235
  -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
  -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
  -DTDESKTOP_LAUNCHER_BASENAME=org.telegram.desktop.desktop
- -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')
- -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=$(vopt_if webrtc 'OFF' 'ON')"
+ -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools python"
 makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  minizip-devel opus-devel xxHash-devel pulseaudio-devel qt5-devel range-v3
  libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel
  MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
  xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel)
- $(vopt_if webrtc tg_owt)"
+ kwayland-devel glibmm-devel tg_owt"
 depends="qt5-imageformats qt5-core>=5.15.2<5.15.3"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
@@ -26,10 +25,10 @@ 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=c7878c4d7c621a175b3b27895b3fb8c20a56319214d5030d734b2768390a8b73
+checksum=41bfbe1ee63da9a6af7cf7d11b1cdd13a6754b51b294ac5a9d56f5f11dfbdd05
 
-build_options="spellcheck webrtc"
-build_options_default="spellcheck webrtc"
+build_options="spellcheck"
+build_options_default="spellcheck"
 
 case $XBPS_TARGET_MACHINE in
 	mips*) broken="unsupported";;

From ff7c0ae3ba249a2b234f79fe4236702c117c5363 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 27 Mar 2021 01:59:29 -0700
Subject: [PATCH 0031/2024] NetAuth: update to 0.4.2

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

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index 81a56aa405de..b66ba32d7348 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,6 +1,6 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
-version=0.4.1
+version=0.4.2
 revision=1
 wrksrc=netauth-$version
 build_style="go"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/NetAuth/archive/v$version.tar.gz"
-checksum=0d68df48faa114a96c3e636fbfbd558fbac1f24f59f383be1449eec3a8101a4d
+checksum=09246b3a9579f56a9c55bc4beefad9c39e9afad434ac13c344e390ee89d707bb
 
 do_check() {
 	go test -v ./...

From 4f1d4af890ab00abec7381021eda8e85412ef5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 27 Mar 2021 14:48:59 +0100
Subject: [PATCH 0032/2024] adwaita-qt: update to 1.2.1.

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

diff --git a/srcpkgs/adwaita-qt/template b/srcpkgs/adwaita-qt/template
index 114b6982093f..08752a9a660c 100644
--- a/srcpkgs/adwaita-qt/template
+++ b/srcpkgs/adwaita-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-qt'
 pkgname=adwaita-qt
-version=1.2.0
+version=1.2.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/FedoraQt/adwaita-qt"
 distfiles="https://github.com/FedoraQt/adwaita-qt/archive/${version}.tar.gz"
-checksum=5698025e1fe3479397516e504c20943611afe040c89dca6531c309fd4198cc6b
+checksum=0673586fe37469eb826be821b3f2c12f055e99a6ca0a8377cfa06b123543ae56

From b005e4cc6d441628b56a07efac409ca8148aea75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 27 Mar 2021 14:48:59 +0100
Subject: [PATCH 0033/2024] diffoscope: update to 171.

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

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 2d35c8b26136..517e9ee6465d 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,7 +1,7 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=167
-revision=2
+version=171
+revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
 make_check_args="-k not((test_wasm)and((test_identification)or(test_no_differences)))"
@@ -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=d95cef5b3eef49fa1c811c1ac103f7f7cca4a0ebabc674e4283b51f28309d242
+checksum=a14af04a63dd526445b24f358b4856985e637891627b7a0fab90443990850f85

From bc8602b314da6eb16f14b862c78dbc9eba6fb32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 27 Mar 2021 14:49:00 +0100
Subject: [PATCH 0034/2024] py3c: update to 1.3.1.

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

diff --git a/srcpkgs/py3c/template b/srcpkgs/py3c/template
index d114174e087c..ccf98cbbf68e 100644
--- a/srcpkgs/py3c/template
+++ b/srcpkgs/py3c/template
@@ -1,6 +1,6 @@
 # Template file for 'py3c'
 pkgname=py3c
-version=1.3
+version=1.3.1
 revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://py3c.readthedocs.io"
 changelog="https://raw.githubusercontent.com/encukou/py3c/master/doc/source/changelog.rst"
 distfiles="https://github.com/encukou/py3c/archive/v${version}.tar.gz"
-checksum=8364eca74ec273c647317abaf0f9936cab81feed0d204e7d856dbf018986b923
+checksum=f3e138623a87cde2cd7d8e98b51447e033d43a3f639c5054185c859fa1888727
 
 post_install() {
 	vlicense LICENSE.MIT

From a3f0941d6919d3dc9f0fb78b51107fadfb949cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 27 Mar 2021 14:49:00 +0100
Subject: [PATCH 0035/2024] python3-alembic: update to 1.5.8.

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

diff --git a/srcpkgs/python3-alembic/template b/srcpkgs/python3-alembic/template
index f77389f8b7b7..a02b8919ee55 100644
--- a/srcpkgs/python3-alembic/template
+++ b/srcpkgs/python3-alembic/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-alembic'
 pkgname=python3-alembic
-version=1.4.3
+version=1.5.8
 revision=1
 wrksrc="alembic-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://github.com/sqlalchemy/alembic"
 distfiles="${PYPI_SITE}/a/alembic/alembic-${version}.tar.gz"
-checksum=5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245
+checksum=e27fd67732c97a1c370c33169ef4578cf96436fa0e7dcfaeeef4a917d0737d56
 
 do_check() {
 	: tests require deprecated pytest behavior that throws errors

From e4d2a234de4c3f9672f1562032d505498741f986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 27 Mar 2021 14:49:00 +0100
Subject: [PATCH 0036/2024] python3-cheetah3: update to 3.2.6.post1.

---
 .../python3-cheetah3/patches/tox-py39.patch   | 55 -------------------
 srcpkgs/python3-cheetah3/template             |  4 +-
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 srcpkgs/python3-cheetah3/patches/tox-py39.patch

diff --git a/srcpkgs/python3-cheetah3/patches/tox-py39.patch b/srcpkgs/python3-cheetah3/patches/tox-py39.patch
deleted file mode 100644
index 33380547f6ad..000000000000
--- a/srcpkgs/python3-cheetah3/patches/tox-py39.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1f0faa7f7dc6d13b49ed9b91110b98e1a55a9ba3 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Fri, 16 Oct 2020 12:27:06 -0400
-Subject: [PATCH] tox.ini: support Python 3.9
-
----
- tox.ini | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/tox.ini b/tox.ini
-index 45893c0..5df9174 100644
---- tox.ini
-+++ tox.ini
-@@ -5,7 +5,7 @@
- 
- [tox]
- minversion = 2.0
--envlist = py27,py3{4,5,6,7,8},py{27,38}-flake8,pypy
-+envlist = py27,py3{4,5,6,7,8,9},py{27,38,39}-flake8,pypy
- 
- [testenv]
- basepython =
-@@ -15,6 +15,7 @@ basepython =
-     py36: {env:TOXPYTHON:python3.6}
-     py37: {env:TOXPYTHON:python3.7}
-     py38: {env:TOXPYTHON:python3.8}
-+    py39: {env:TOXPYTHON:python3.9}
-     pypy: {env:TOXPYTHON:pypy}
- commands =
-     {envpython} --version
-@@ -63,6 +64,10 @@ commands =
- commands =
-     {[tests]commands}
- 
-+[testenv:py39]
-+commands =
-+    {[tests]commands}
-+
- [testenv:py27-flake8]
- deps =
-     flake8
-@@ -77,6 +82,13 @@ commands =
-     {[testenv]commands}
-     flake8 .
- 
-+[testenv:py39-flake8]
-+deps =
-+    flake8
-+commands =
-+    {[testenv]commands}
-+    flake8 .
-+
- [testenv:pypy]
- commands =
-     {[tests]commands}
diff --git a/srcpkgs/python3-cheetah3/template b/srcpkgs/python3-cheetah3/template
index 4cc72a69f99c..fe46fbe09607 100644
--- a/srcpkgs/python3-cheetah3/template
+++ b/srcpkgs/python3-cheetah3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cheetah3'
 pkgname=python3-cheetah3
-version=3.2.6
+version=3.2.6.post1
 revision=1
 wrksrc="Cheetah3-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="http://www.cheetahtemplate.org/"
 distfiles="${PYPI_SITE}/C/Cheetah3/Cheetah3-${version}.tar.gz"
-checksum=f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b
+checksum=58b5d84e5fbff6cf8e117414b3ea49ef51654c02ee887d155113c5b91d761967
 conflicts="python-cheetah>=0"
 
 do_check() {

From ef7759339637bdd21c0f0e83f21fc7d944ddf6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 27 Mar 2021 14:49:00 +0100
Subject: [PATCH 0037/2024] python3-pytest-cov: update to 2.11.1.

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

diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index 87912eb2debc..81cf3bdda1f3 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-cov'
 pkgname=python3-pytest-cov
-version=2.10.1
-revision=3
+version=2.11.1
+revision=1
 wrksrc="pytest-cov-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,8 @@ license="MIT"
 homepage="https://pytest-cov.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/pytest-dev/pytest-cov/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pytest-cov/pytest-cov-${version}.tar.gz"
-checksum=47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e
+checksum=359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7
+make_check=no # requires unpackaged xdist, fields, process_tests
 
 post_install() {
 	vlicense LICENSE

From 02d63d6cc02e2bbc028bd12225772b909883e16f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 27 Mar 2021 14:49:00 +0100
Subject: [PATCH 0038/2024] tlsh: update to 3.19.1.

---
 srcpkgs/tlsh/template | 7 ++++---
 srcpkgs/tlsh/update   | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/tlsh/update

diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template
index 7cb5c28b48b9..1f96834107cc 100644
--- a/srcpkgs/tlsh/template
+++ b/srcpkgs/tlsh/template
@@ -1,7 +1,7 @@
 # Template file for 'tlsh'
 pkgname=tlsh
-version=3.17.0
-revision=2
+version=3.19.1
+revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-devel"
@@ -10,10 +10,11 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/trendmicro/tlsh"
 distfiles="https://github.com/trendmicro/tlsh/archive/${version}.tar.gz"
-checksum=810cecdda1632ecb836278e5a58560d5b2b7911d02ed7419dc02b6a38e635985
+checksum=a8a7972d8bafb5fd66bd597b72037356dd9882e71a7e9b5f37281751a99ce686
 
 pre_configure() {
 	vsed -i src/CMakeLists.txt -e 's/set(TLSH_SHARED_LIBRARY 0)/set(TLSH_SHARED_LIBRARY 1)/'
+	vsed -i Testing/CMakeLists.txt -e '/xlen/d'
 }
 
 post_build() {
diff --git a/srcpkgs/tlsh/update b/srcpkgs/tlsh/update
new file mode 100644
index 000000000000..dbcddf2a9fac
--- /dev/null
+++ b/srcpkgs/tlsh/update
@@ -0,0 +1 @@
+ignore="4*"

From c58d2f5c518342c3a65f954ee4e47a6d300b3fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sat, 13 Mar 2021 15:02:53 +0100
Subject: [PATCH 0039/2024] New package: autotiling

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

diff --git a/srcpkgs/autotiling/template b/srcpkgs/autotiling/template
new file mode 100644
index 000000000000..f28e5c22e563
--- /dev/null
+++ b/srcpkgs/autotiling/template
@@ -0,0 +1,15 @@
+# Template file for 'autotiling'
+pkgname=autotiling
+version=1.4
+revision=1
+build_style=python3-module
+hostmakedepends="python3-wheel"
+depends="python3-i3ipc"
+short_desc="Automatically switch horizontal/vertical split orientation in i3/sway"
+maintainer="Adrian Göransson <adriangoransson@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/nwg-piotr/autotiling"
+distfiles="https://github.com/nwg-piotr/${pkgname}/archive/v${version}.tar.gz"
+checksum=739653ffa8fc1bb5396e3c64cf35e25b343dd0391de5c8e71362c553a86e656f
+# There is no test suite for this package
+make_check=no

From e4f0aa46c841f2101e9debd9c7ef72a6fcaba355 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 27 Mar 2021 11:55:23 +0100
Subject: [PATCH 0040/2024] xterm: update to 367.

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

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 072a34dd92a5..b7e3ab41f825 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=366
+version=367
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -20,7 +20,7 @@ license="MIT, X11"
 homepage="http://invisible-island.net/xterm/"
 changelog="http://invisible-island.net/xterm/xterm.log.html"
 distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e
+checksum=27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f
 
 post_install() {
 	for f in {u,}xterm.desktop; do

From 2fe106163a394174cb54c792cbe75c109d213388 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 27 Mar 2021 00:23:01 +0100
Subject: [PATCH 0041/2024] krita: update to 4.4.3.

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

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index a11f17a21b7a..5de985483bb0 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,18 +1,18 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.2
+version=4.4.3
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3
- qt5-qmake qt5-host-tools kcoreaddons python3-sip-devel python3-PyQt5
+ qt5-qmake qt5-host-tools kcoreaddons python3-PyQt5
  python3-PyQt5-devel"
 makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
  kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
  kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
  boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
  opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
- poppler-qt5-devel giflib-devel python3-devel python3-sip-devel python3-PyQt5
+ poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
  python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
  libopenjpeg2-devel"
 short_desc="Painting and image editing program"
@@ -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=9696aec56e759f3e1c22952ca17efdcac97003239f515f570ad9f07e36cb9792
+checksum=d4062323c2237ab9195c0b8bce1a69e30bd6fd10fadbad6395c27211d9878f67
 python_version=3
 replaces="calligra-krita>=0"
 

From 7559c3f14e8078d0195ada69a207e912782de343 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Mar 2021 16:32:43 +0100
Subject: [PATCH 0042/2024] courier-unicode: update to 2.2.3.

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

diff --git a/srcpkgs/courier-unicode/template b/srcpkgs/courier-unicode/template
index f8a6ab39fef2..ca1dd962081f 100644
--- a/srcpkgs/courier-unicode/template
+++ b/srcpkgs/courier-unicode/template
@@ -1,6 +1,6 @@
 # Template file for 'courier-unicode'
 pkgname=courier-unicode
-version=2.2.2
+version=2.2.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.courier-mta.org/unicode/"
 distfiles="${SOURCEFORGE_SITE}/courier/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=9ed00e4b589259e81e09be6e21f24d6ba1159cdb5daa0ed722bebebb4c43fae1
+checksum=08ecf5dc97529ce3aa9dcaa085860762de636ebef968bf4b6e0cdfaaf18c7aff
 
 courier-unicode-devel_package() {
 	short_desc+=" - development files"

From 58a046b9758c6327f24011ca47bfb35582d3f454 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Mar 2021 16:33:10 +0100
Subject: [PATCH 0043/2024] nncp: update to 6.2.1.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 19e9f76260fa..85639e333dcf 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=6.2.0
+version=6.2.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=272ceded69fff3b3787672973199481ac610b753bb82c22eecec45fc05da40fe
+checksum=d9682d954d68025af5b07516258d9ffcda29a4d7e7e1635be0c219a1c5ddb067
 
 do_build() {
 	make

From 0a6f221880e98c9d13d1be0253d4c9a3828f0d2c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Mar 2021 16:34:12 +0100
Subject: [PATCH 0044/2024] re2c: update to 2.1.

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

diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 8c8fc6722c01..c253251157b0 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,6 +1,6 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.0.3
+version=2.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=b2bc1eb8aaaa21ff2fcd26507b7e6e72c5e3d887e58aa515c2155fb17d744278
+checksum=8cba0d95c246c670de8f97f57def83a9c0f2113eaa6f7e4867a941f48f633540

From 19f9ef28d8d8426074088b80bf334efb859ce745 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 27 Mar 2021 17:50:41 +0400
Subject: [PATCH 0045/2024] mate-session-manager: update to 1.24.2.

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

diff --git a/srcpkgs/mate-session-manager/template b/srcpkgs/mate-session-manager/template
index e4280268f505..f186ef57c31f 100644
--- a/srcpkgs/mate-session-manager/template
+++ b/srcpkgs/mate-session-manager/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-session-manager'
 pkgname=mate-session-manager
-version=1.24.1
+version=1.24.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-elogind"
@@ -11,4 +11,4 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1c472a3da20c2c69b1de9f2746f23ceaf149bb633fb8b8496715c5fbd4698ff
+checksum=6b0b9c0c4fe831e4f000e55a2ebb953cf2a83eed613faaf3e23c8beec42c8bc9

From 54668b280ad381fe6d0a9190049733d68a799e80 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 27 Mar 2021 23:43:32 +0400
Subject: [PATCH 0046/2024] mate-settings-daemon: update to 1.24.2.

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

diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template
index 092cf7a72273..010361166854 100644
--- a/srcpkgs/mate-settings-daemon/template
+++ b/srcpkgs/mate-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-settings-daemon'
 pkgname=mate-settings-daemon
-version=1.24.1
+version=1.24.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse"
@@ -14,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4bf92e6f0ebaae1db3ace4a8d12fc5d40302abe0ab7d75b419e5961c47e63e58
+checksum=8c25b4f8aba69b9a0597e8759f9ef23f12ac0d3153f3f5b5a6d4afd0733f3914
 
 mate-settings-daemon-devel_package() {
 	depends="${sourcepkg}-${version}_${revision} dbus-glib-devel"

From b843e44e83cfdae7c42e407d1434b9e328336b31 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 28 Mar 2021 12:04:03 +1100
Subject: [PATCH 0047/2024] dunst: fix ~wayland build option

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

diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index 9d054656c503..533c8e92bff0 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -5,6 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="SYSTEMD=0 WAYLAND=$(vopt_if wayland 1 0)"
+make_install_args="$make_build_args"
 hostmakedepends="perl pkg-config"
 makedepends="gtk+-devel libXScrnSaver-devel libXinerama-devel libXrandr-devel
  libxdg-basedir-devel libnotify-devel $(vopt_if wayland 'wayland-devel wayland-protocols')"

From 0178ab71279de5fa540ec7212368861a8e6d925c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 27 Mar 2021 13:07:46 +0100
Subject: [PATCH 0048/2024] revive: update to 1.0.5.

---
 srcpkgs/revive/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index 4090942ba42e..faffa9f252da 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,6 +1,6 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.0.3
+version=1.0.5
 revision=1
 build_style=go
 go_import_path="github.com/mgechev/revive"
@@ -9,7 +9,11 @@ maintainer="Paper <paper@tilde.institute>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=3f829c35dcc8b94bb78c706c2a35bb1f5c77e83128614aa3867fe2952d0ce936
+checksum=9569e25a889dc546bead5ee8616002799ae13fd50860f51388ad2e3d3e55ceaa
+
+do_check() {
+	go test -v ./...
+}
 
 post_install() {
 	vdoc RULES_DESCRIPTIONS.md

From 0789bbdc90e247276c1239cd969fc78fb0ff9879 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 28 Mar 2021 00:46:06 +0200
Subject: [PATCH 0049/2024] fossil: update to 2.15.

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

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 148b72480894..7716cf704eaa 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,7 +1,7 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.14
-revision=2
+version=2.15
+revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 distfiles="https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
-checksum=b8d0c920196dd8ae29152fa7448e513a1fa7c588871b785e3fbfc07b42a05fb9
+checksum=671edda9a014474d0f07b4c616b37222e218275b3c8e5414657830c6f351877b
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

From b79f91bde837fe39f954af203ae59c02008a635c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Wed, 17 Mar 2021 13:23:36 +0000
Subject: [PATCH 0050/2024] tailscale: update to 1.6.0.

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

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index bd44d56b4cb1..cad1dd560a0b 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.4.5
+version=1.6.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=f285d5028f71f0ec7d701b14a8526de61dd3ee75cecaeb50db724b904c1daa76
+checksum=4591c6f6d3d1f9d5aecaa63dd580c389067edeb7287cd587b108ea6a0aa811e7
 
 post_install() {
 	vlicense LICENSE

From 2769d634327d2852965463120b24c7d8b8b910cc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 28 Mar 2021 01:01:17 +0200
Subject: [PATCH 0051/2024] mg: update to 20210314.

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

diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template
index a860642803c3..8bb7fd00185e 100644
--- a/srcpkgs/mg/template
+++ b/srcpkgs/mg/template
@@ -1,6 +1,6 @@
 # Template file for 'mg'
 pkgname=mg
-version=20200723
+version=20210314
 revision=1
 hostmakedepends="pkg-config"
 makedepends="libbsd-devel ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://github.com/hboetes/mg"
 distfiles="https://github.com/hboetes/mg/archive/${version}.tar.gz"
-checksum=2ee7cf5e1ea9aee1df296840276a0f940a72f5dfa07c5d2be36cdb13236bd797
+checksum=6820e76a0e27d9a744624d421b3b30b0030140c2a817df1310b25c3abe397106
 
 CFLAGS="-DTCSASOFT=0"
 

From 29a1a40d89031da591c35559673bea71384615d6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:23:57 -0700
Subject: [PATCH 0052/2024] cmusfm: fix license

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

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6361f832d745..e763b5126153 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,14 +1,14 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"
 makedepends="libcurl-devel libnotify-devel"
 short_desc="Last.fm scrobbler for cmus"
 maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/Arkq/cmusfm"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=9d9fa7df01c3dd7eecd72656e61494acc3b0111c07ddb18be0ad233110833b63

From 0dae1275f8c56c1d1f68335ca261d7704fd3644c Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Sat, 27 Mar 2021 10:14:17 +0100
Subject: [PATCH 0053/2024] python3-markdown2: update to 2.4.0.

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

diff --git a/srcpkgs/python3-markdown2/template b/srcpkgs/python3-markdown2/template
index a79bc5fee6dc..5d60d3c7ce42 100644
--- a/srcpkgs/python3-markdown2/template
+++ b/srcpkgs/python3-markdown2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-markdown2'
 pkgname=python3-markdown2
-version=2.3.8
-revision=4
+version=2.4.0
+revision=1
 wrksrc=python-markdown2-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="https://github.com/trentm/python-markdown2"
 distfiles="https://github.com/trentm/python-markdown2/archive/${version}.tar.gz"
-checksum=@f2439906b925fb3991b8e4c01909bd2e6cb3aa75ce64a053b5495f9c72726f77
+checksum=372fc64b1a6f949fb6379cc0fdb47c832b875b575d50b9c641d09c4971ca9f30
 
 do_check() {
 	PY3PATH="${PWD}/build/lib"

From b71f6b3169e7c064de48ef5cd506bca5ff7b32e6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:36:58 -0700
Subject: [PATCH 0054/2024] cutemarked: fix license

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

diff --git a/srcpkgs/cutemarked/template b/srcpkgs/cutemarked/template
index 53997add9ef9..39f15d81ea08 100644
--- a/srcpkgs/cutemarked/template
+++ b/srcpkgs/cutemarked/template
@@ -2,15 +2,15 @@
 pkgname=cutemarked
 reverts="v0.11.0_1"
 version=0.11.3
-revision=7
+revision=8
 wrksrc="CuteMarkEd-${version}"
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake"
 makedepends="qt5-devel qt5-tools-devel qt5-webkit-devel discount-devel hunspell-devel"
 depends="desktop-file-utils"
-short_desc="A Markdown editor with live HTML preview"
+short_desc="Markdown editor with live HTML preview"
 maintainer="Logen K <logen@sudotask.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://cloose.github.io/CuteMarkEd/"
 distfiles="https://github.com/cloose/${pkgname}/archive/v${version}.tar.gz"
 checksum=78a41808c2f0452375810abdff76eeaaee012f8d1368a2b8772ec6b4d2ceeec8

From 4a66d9a6e0d2748d3303e2c0f11044b4422f09f3 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 27 Mar 2021 12:44:49 +0100
Subject: [PATCH 0055/2024] yq-go: update to 4.6.3.

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

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index fa5fb53ec35e..f94fe745cd47 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.6.2
+version=4.6.3
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=3edee5bae40afdf8869803c6f81eb15adbaaf373ba27e4907d6dd5dceebaf65c
+checksum=85d7e0cbc12ac690fd86e77bef7a7ce27e0969191a9b6d3bb491ec690659d681
 
 do_check() {
 	go test -v

From 3e9b795a3b40e7d9e9ab2f88a83d35df6773d691 Mon Sep 17 00:00:00 2001
From: Dominic Monroe <monroef4+github@gmail.com>
Date: Sat, 27 Mar 2021 08:54:15 +0000
Subject: [PATCH 0056/2024] clojure: update to 1.10.3.814.

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

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index d119c8e82de8..ecc6b11dab9f 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.2.796
+version=1.10.3.814
 revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
@@ -9,7 +9,7 @@ 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=af8feacb8f4ad3135c10b7cd60b996c230f2d133f10dd1549e6beeb79577da7b
+checksum=fa3a6786e28fbf128903cc43a3d1a244aa4525d3d84494ecb2666d69f69d127e
 
 do_install() {
 	vmkdir /usr/lib/clojure

From 8ec5a50149caf036fcb3e0351cf63502414d2ab2 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 27 Mar 2021 10:51:31 +0530
Subject: [PATCH 0057/2024] foliate: update to 2.6.2.

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

diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template
index 3e83f0f23b8c..ba9e6c7c956b 100644
--- a/srcpkgs/foliate/template
+++ b/srcpkgs/foliate/template
@@ -1,6 +1,6 @@
 # Template file for 'foliate'
 pkgname=foliate
-version=2.5.0
+version=2.6.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext gjs glib-devel"
@@ -11,7 +11,7 @@ maintainer="lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://johnfactotum.github.io/foliate/"
 distfiles="https://github.com/johnfactotum/foliate/archive/${version}.tar.gz"
-checksum=3b5317b96ccb19aaa79a1ff0a751a7cc5f8607649681c42900daf0f02a4da672
+checksum=974cac48d8ade2c623dfa5f45cfeafb99e646d7bf2df11a3928237c2829c1ac4
 python_version=3
 
 post_install() {

From 633da9ea23453d0f3c74f4a7f5731a051e1fe5c6 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 27 Mar 2021 10:46:33 +0530
Subject: [PATCH 0058/2024] Komikku: update to 0.27.0.

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index ece40f3ed604..44cbbdf30b5b 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -15,4 +15,4 @@ 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=3f21d17414d33e9a33d831e4eeb297d62c27920b7e63de0abe755cb0983b3652
+checksum=d4ecd12d7fc3a6a3e5fde3ed03608ff48045c2e7425b66ef0fadf04941643da2

From cd5d29fe95f58b0ba7b86be6243860f5238a51a8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 22:05:10 -0700
Subject: [PATCH 0059/2024] bullet: fix licensing

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

diff --git a/srcpkgs/bullet/template b/srcpkgs/bullet/template
index 436a12532ce8..2ab9d35ae0fd 100644
--- a/srcpkgs/bullet/template
+++ b/srcpkgs/bullet/template
@@ -1,7 +1,7 @@
 # Template file for 'bullet'
 pkgname=bullet
 version=2.89
-revision=1
+revision=2
 wrksrc="bullet3-${version}"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=0 -DBUILD_CPU_DEMOS=0
@@ -10,7 +10,7 @@ make_cmd=make
 makedepends="glu-devel"
 short_desc="3D Collision Detection and Rigid Body Dynamics Library"
 maintainer="John <me@johnnynator.dev>"
-license="zlib"
+license="Zlib"
 homepage="http://www.bulletphysics.com/Bullet/"
 distfiles="https://github.com/bulletphysics/bullet3/archive/${version}.tar.gz"
 checksum=621b36e91c0371933f3c2156db22c083383164881d2a6b84636759dc4cbb0bb8

From caa61f1054d8749798431ae28f23eca41cdc2385 Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Sat, 27 Mar 2021 19:29:39 -0700
Subject: [PATCH 0060/2024] rebar3: update to 3.14.4.

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

diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template
index 2d49e89a8fc8..037ad09cf25d 100644
--- a/srcpkgs/rebar3/template
+++ b/srcpkgs/rebar3/template
@@ -1,6 +1,6 @@
 # Template file for 'rebar3'
 pkgname=rebar3
-version=3.14.1
+version=3.14.4
 revision=1
 hostmakedepends=erlang
 depends="erlang>=22"
@@ -9,7 +9,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"
 homepage="https://www.rebar3.org/"
 distfiles="https://github.com/erlang/rebar3/archive/${version}.tar.gz"
-checksum=b01275b6cbdb354dcf9ed686fce2b5f9dfdd58972ded9e970e31b9215a8521f2
+checksum=8d78ed53209682899d777ee9443b26b39c9bf96c8b081fe94b3dd6693077cb9a
 
 do_build() {
 	./bootstrap

From e33258f787720380b213fee72a83b9c7bcf22242 Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Sat, 27 Mar 2021 19:19:34 -0700
Subject: [PATCH 0061/2024] sops: update to 3.7.0.

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

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index ca43b4a502dd..f1215b6c3eb7 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
-version=3.6.1
-revision=2
+version=3.7.0
+revision=1
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"
@@ -11,4 +11,4 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/sops"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=bb6611eb70580ff74a258aa8b9713fdcb9a28de5a20ee716fe6b516608a60237
+checksum=909496eaed98f6ff4fadc216ad904ef2d2a82ff229e6af6cc0cb1625e2df5d83

From e3b80f48ecd25143caf27b1c73d0f7cab23ed45a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 28 Mar 2021 02:01:37 -0300
Subject: [PATCH 0062/2024] gnome-desktop: fix thumbnail generation on musl
 systems.

/etc/ld.so.cache doesn't exist on musl systems, which makes the bwrap
command fail. Users will have to remove the "failed generation" cache
from ~/.cache/thumbnails/fail/ for nautilus to reattempt thumbnail
generation of previously visited directories.

Upstream issue:
https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/117

Seems to be the direction upstream is moving in as well:
https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/107

Fixes #29767.
---
 .../patches/thumbnail-bwrap-musl.patch              | 13 +++++++++++++
 srcpkgs/gnome-desktop/template                      |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch

diff --git a/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch b/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch
new file mode 100644
index 000000000000..9b53c755dab8
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch
@@ -0,0 +1,13 @@
+diff --git libgnome-desktop/gnome-desktop-thumbnail-script.c libgnome-desktop/gnome-desktop-thumbnail-script.c
+index cfbbad0..efad40b 100644
+--- libgnome-desktop/gnome-desktop-thumbnail-script.c
++++ libgnome-desktop/gnome-desktop-thumbnail-script.c
+@@ -532,7 +532,7 @@ add_bwrap (GPtrArray   *array,
+   add_args (array,
+ 	    "bwrap",
+ 	    "--ro-bind", "/usr", "/usr",
+-	    "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
++	    "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
+ 	    NULL);
+ 
+   /* These directories might be symlinks into /usr/... */
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 4e98eea5eeaa..0196656cc4b8 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
 version=3.38.4
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled

From db3a2ea95251ffc7bc4a87d8e8631c83da1f100f Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sun, 28 Mar 2021 12:57:24 +0200
Subject: [PATCH 0063/2024] plasma-systemmonitor: add missing runtime
 dependencies

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

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3e62a192928d..e57ccefd171e 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,11 +1,12 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
 version=5.21.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
  kconfig kcoreaddons"
 makedepends="kirigami2-devel libksysguard-devel kitemmodels-devel"
+depends="kirigami2 qqc2-desktop-style kquickcharts ksysguard"
 short_desc="Application for monitoring system resources"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"

From 680ee4144fefc688df7a4e9887f83196f5501940 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 27 Mar 2021 16:25:00 +0100
Subject: [PATCH 0064/2024] ksnip: update to 1.8.2.

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

diff --git a/srcpkgs/ksnip/template b/srcpkgs/ksnip/template
index b0de5c518d27..eabfcd45c7a6 100644
--- a/srcpkgs/ksnip/template
+++ b/srcpkgs/ksnip/template
@@ -1,6 +1,6 @@
 # Template file for 'ksnip'
 pkgname=ksnip
-version=1.8.1
+version=1.8.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/DamirPorobic/ksnip"
 distfiles="https://github.com/DamirPorobic/ksnip/archive/v${version}.tar.gz"
-checksum=1842628cc444d83bc16170285e313b740219aa2d4a0ad3b630a91a6cea39de59
+checksum=3939ae0fb04494b11c6c6cb7a4b53cd837d282eb96beafdc1acede81abbf9e36

From a97237bad2ccedf4741dc92ce527ebe25fc43ae0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 27 Mar 2021 16:25:09 +0100
Subject: [PATCH 0065/2024] kImageAnnotator: update to 0.4.2.

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

diff --git a/srcpkgs/kImageAnnotator/template b/srcpkgs/kImageAnnotator/template
index 0b731a6f5238..95ef67413858 100644
--- a/srcpkgs/kImageAnnotator/template
+++ b/srcpkgs/kImageAnnotator/template
@@ -1,6 +1,6 @@
 # Template file for 'kImageAnnotator'
 pkgname=kImageAnnotator
-version=0.4.1
+version=0.4.2
 revision=1
 build_style=cmake
 # XXX: Tests don't build
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/DamirPorobic/kImageAnnotator"
 distfiles="https://github.com/DamirPorobic/kImageAnnotator/archive/v${version}.tar.gz"
-checksum=64e62f7379a0741f675515e57c21311ebbc6544da8c8a003a5a1ec4964902ac8
+checksum=9e8945d8b5871a1020be643088d15cd76496ad707a1f464af8dd91958b430856
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 58e69e8c4935ab774547982413cab9933f658add Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 27 Mar 2021 16:27:34 +0100
Subject: [PATCH 0066/2024] mediainfo: update to 21.03.

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

diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template
index a5e292453f10..c18d68247cc1 100644
--- a/srcpkgs/mediainfo/template
+++ b/srcpkgs/mediainfo/template
@@ -1,7 +1,7 @@
 # Template file for 'mediainfo'
 pkgname=mediainfo
-version=20.09
-revision=2
+version=21.03
+revision=1
 wrksrc=MediaInfo
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake libtool pkg-config"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause"
 homepage="https://mediaarea.net/MediaInfo"
 distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.xz"
-checksum=39327ef83caa38a96114d1b90654012b9ef727538fe82c37dd67aea2cf4f0f67
+checksum=de50ca0b2c607b8999d3c9e542d27c97030a59f31859b612335315be6850021e
 replaces="mediainfo-gui>=0"
 
 do_configure() {

From 7c851cbad1a4f472b808eec9dbc658a597715e63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 27 Mar 2021 16:27:42 +0100
Subject: [PATCH 0067/2024] libmediainfo: update to 21.03.

---
 srcpkgs/libmediainfo/patches/tests.patch | 29 ------------------------
 srcpkgs/libmediainfo/template            |  4 ++--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/libmediainfo/patches/tests.patch

diff --git a/srcpkgs/libmediainfo/patches/tests.patch b/srcpkgs/libmediainfo/patches/tests.patch
deleted file mode 100644
index 9f1c44018f3b..000000000000
--- a/srcpkgs/libmediainfo/patches/tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Project/GNU/Library/test/utils.sh	2020-10-17 17:36:11.648662226 +0200
-+++ -	2020-10-17 17:38:40.423209231 +0200
-@@ -1,26 +1,6 @@
- #!/bin/sh
- UTILS_PATH=$(dirname "$0")
- 
--if [ ! -f "$UTILS_PATH/mediatrace.xsd" ]
--then
--    wget https://github.com/MediaArea/MediaAreaXml/raw/master/mediatrace.xsd -O "$UTILS_PATH/mediatrace.xsd"
--fi
--
--if [ ! -f "$UTILS_PATH/micromediatrace.xsd" ]
--then
--    wget https://github.com/MediaArea/MediaAreaXml/raw/master/micromediatrace.xsd -O "$UTILS_PATH/micromediatrace.xsd"
--fi
--
--if [ ! -f "$UTILS_PATH/mediainfo_2_0.xsd" ]
--then
--    wget https://mediaarea.net/mediainfo/mediainfo_2_0.xsd -O "$UTILS_PATH/mediainfo.xsd"
--fi
--
--if [ ! -f "$UTILS_PATH/mediaarea.xsd" ]
--then
--    wget https://github.com/MediaArea/MediaAreaXml/raw/master/mediaarea.xsd -O "$UTILS_PATH/mediaarea.xsd"
--fi
--
- enabled()
- {
-     if test -z "${RUN_TESTS+x}" ; then
diff --git a/srcpkgs/libmediainfo/template b/srcpkgs/libmediainfo/template
index c0a2eebed2d3..5b18fcec86d5 100644
--- a/srcpkgs/libmediainfo/template
+++ b/srcpkgs/libmediainfo/template
@@ -1,6 +1,6 @@
 # Template file for 'libmediainfo'
 pkgname=libmediainfo
-version=20.09
+version=21.03
 revision=1
 _tests_commit=983666091bee260198d8426e2045f1aca85e5e2f
 wrksrc=MediaInfoLib
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause"
 homepage="https://mediaarea.net/MediaInfo"
 distfiles="https://mediaarea.net/download/source/libmediainfo/${version}/${pkgname}_${version}.tar.xz"
-checksum="d07ce857330a9f9eedc4e5748f8022af1e9540e88a732d4e45c818c8ec4dd196
+checksum="56b7e9abf80cba48032165cd7a46fd8d43dd63e3af35765f66c3f134caaca4ca
  a11b37a3c421da4b876f3d9394e9b4c5893115e5431774c2f34225753c01a399
  40ff46f5475cd20e110b92b312ec30196ffe691b84f355e6a8923a038df4ed39
  adb4bdb1b354299b95c8484a6ffeafe06614de29a0fd070caff3d7b059f89b4b

From 898a053683ab36cd09d47a48b3abaee845db396b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Mar 2021 15:14:35 +0200
Subject: [PATCH 0068/2024] kimap: depend on cyrus-sasl-modules

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

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 8a567e28fb0e..332a609aa036 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,11 +1,12 @@
 # Template file for 'kimap'
 pkgname=kimap
 version=20.12.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons"
 makedepends="kio-devel kmime-devel"
+depends="cyrus-sasl-modules"
 short_desc="Job-based API for interacting with IMAP servers"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 61e2303d423ff897d3786536c8aafd70d0220f36 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 Mar 2021 14:47:38 +0200
Subject: [PATCH 0069/2024] whois: update to 5.5.9.

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

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index f8176385d374..10f382bad6e4 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,6 +1,6 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.8
+version=5.5.9
 revision=1
 wrksrc=whois
 hostmakedepends="perl pkg-config gettext"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.linux.it/~md/software"
 changelog="https://raw.githubusercontent.com/rfc1036/whois/next/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=cd9e7bad3b6968182bfcc311e22be3aec9a974397377d748845147884ce07547
+checksum=69088241ed33d2204f153c8005b312a69b60a1429075ff49f42f9f1f73a19c19
 
 alternatives="
  whois:whois:/usr/bin/gwhois

From 7b5199b4e50e1077d7aef235b33e8bd2fcda48a1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 Mar 2021 14:55:25 +0200
Subject: [PATCH 0070/2024] umurmur: update to 0.2.20.

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

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index e3046ab968e6..fa89bf9e8eb7 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,7 +1,7 @@
 # Template file for 'umurmur'
 pkgname=umurmur
-version=0.2.19
-revision=2
+version=0.2.20
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
@@ -13,7 +13,7 @@ license="BSD-3-clause"
 homepage="http://umurmur.net/"
 changelog="https://github.com/umurmur/umurmur/raw/master/ChangeLog"
 distfiles="https://github.com/umurmur/umurmur/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=338053160bc48e48850061cdfc19cf1b2bb66e56877c04cd6de7831b468646b6
+checksum=b7b2978c3197aef0a6531f1cf0ee1aebb32a55ad8bda43064ce3a944edbcac83
 
 system_accounts="umurmur"
 umurmur_homedir="/var/lib/umurmur"

From b8d2be9d36260bd2cf6721a3081afaaedb81e0e5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 Mar 2021 14:57:30 +0200
Subject: [PATCH 0071/2024] libite: update to 2.4.0.

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

diff --git a/srcpkgs/libite/template b/srcpkgs/libite/template
index f7d6bfadc875..87ef4ae653da 100644
--- a/srcpkgs/libite/template
+++ b/srcpkgs/libite/template
@@ -1,6 +1,6 @@
 # Template file for 'libite'
 pkgname=libite
-version=2.3.1
+version=2.4.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ license="MIT, ISC, BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/troglobit/libite"
 changelog="https://raw.githubusercontent.com/troglobit/libite/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/libite/archive/v${version}.tar.gz"
-checksum=d6a01bcfae45db066c771db03996882110dca2222444ee13160bf29bfb206da7
+checksum=5fe375f1350c487337502c7fb6e8a67ff0fb275d7b3934e196fe250ac0a7ad72
 
 pre_configure() {
 	./autogen.sh

From 72e709fb5b5d37b68f562f03ba8d56c8caaba1a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 Mar 2021 15:50:43 +0200
Subject: [PATCH 0072/2024] cppcheck: update to 2.4.1.

---
 srcpkgs/cppcheck/patches/musl.patch | 10 ----------
 srcpkgs/cppcheck/template           |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/cppcheck/patches/musl.patch

diff --git a/srcpkgs/cppcheck/patches/musl.patch b/srcpkgs/cppcheck/patches/musl.patch
deleted file mode 100644
index 8d35414fe9f1..000000000000
--- a/srcpkgs/cppcheck/patches/musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cli/filelister.cpp.orig
-+++ cli/filelister.cpp
-@@ -24,6 +24,7 @@
- 
- #include <cstddef>
- #include <cstring>
-+#include <limits.h>
- 
- #ifdef _WIN32
- 
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index a5df40e311bd..7002a5e7fac9 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.3
+version=2.4.1
 revision=1
 build_style=gnu-makefile
 make_build_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 changelog="https://sourceforge.net/p/cppcheck/news/"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=3c622628ebf46f68909c7a96743b07b6207894a0772fbe802603732152ab1035
+checksum=11a9d9fe5305a105561655c45d2cd83cb30fbc87b41d0569de1b00a1a314867f
 
 post_install() {
 	vman cppcheck.1

From cc72a80adc8eda4448045f519e95eb6827f0afd4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 Mar 2021 15:53:35 +0200
Subject: [PATCH 0073/2024] openradtool: update to 0.12.2.

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

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index fc297bf8e429..894eb63e8b6f 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.11.15
+version=0.12.2
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=947d35d445e7c48f84126929b301fcd260ae9d2f20764a8d6576d3e0953e90e5
+checksum=829368a87d28af95bb12ad986f1ae8055d7a657a59e7e8418acddaf7a0ad5d59
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 01860fde0bee31dc26a6031eee95ef8ba476b219 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 Mar 2021 16:19:49 +0200
Subject: [PATCH 0074/2024] knot: update to 3.0.5.

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

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index b554304a77ac..8b9954bc9033 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.4
+version=3.0.5
 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=451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983
+checksum=695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From b485723acf248c0ed8af6b35cbd2003ca87b42b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 12:23:17 +0100
Subject: [PATCH 0075/2024] android-tools: update to 31.0.0.

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

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 8d95b870e055..64382a05c392 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=30.0.5p1
+version=31.0.0
 revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="http://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=8400387db0ff3c7d030418b9f63ea171917c26e6bcc82d9dc666c8c4c02e9806
+checksum=0b8f16370072d03e9f26de17ecba7dd44771cb042a23e86869108d57eb22f20d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 78db8c6ca9b35d7ac4477a6ff7809370301226f6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 Mar 2021 18:51:03 +0200
Subject: [PATCH 0076/2024] squashfs-tools-ng: update to 1.1.0.

---
 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 8494e2598e78..ba0c6fb21390 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.0.4
+version=1.1.0
 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=e2809efdc51156196db7af591fd9ffc44297624b369619f214794c1b34bffb13
+checksum=110794124b268e92e28e6a95f0781d1338f48c338434ef746f5de68c64e19aeb
 
 squashfs-tools-ng-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 54b118e521eb0da081951aefa033821893cf5487 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Mar 2021 19:21:01 +0200
Subject: [PATCH 0077/2024] k9s: update to 0.24.6.

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

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index da44bfaf06d7..6ceec1f3e0ad 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.4
+version=0.24.6
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,4 +10,4 @@ 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=b1b5b4a0c227893f7a3107725acdb39ce14212282bee531498b5002e1ed2ff17
+checksum=72cce161786273f203421e93d8b22bfa7659fecdf2d0f018a5dc113302ba3958

From 0355771c99bedbb4bde5d08e37c5224127474908 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Mar 2021 19:21:26 +0200
Subject: [PATCH 0078/2024] python3-boto3: update to 1.17.39.

---
 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 22c1f64489e2..abd7e94ef691 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.27
+version=1.17.39
 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=53621cfc54b4bbeebb82ae5ebac2e9cb75d80e85499846b1a55c41d8dbc74207
+checksum=c102ee7188ff80d188f5fc8be9117b2b157c4a08ea85a54946fb6ac206dbc1ac
 
 post_install() {
 	vlicense LICENSE

From 5cd3d95be9729ac735c8fbd2ca33386bf8396685 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Mar 2021 19:22:14 +0200
Subject: [PATCH 0079/2024] fig2dev: update to 3.2.8a.

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

diff --git a/srcpkgs/fig2dev/template b/srcpkgs/fig2dev/template
index b558d94fd288..87bdbd3d8ad6 100644
--- a/srcpkgs/fig2dev/template
+++ b/srcpkgs/fig2dev/template
@@ -1,6 +1,6 @@
 # Template file for 'fig2dev'
 pkgname=fig2dev
-version=3.2.8
+version=3.2.8a
 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=931258ae43950d0931ddcea13ce6554d2cd7fc3c93585aebf74e393bb14fe27d
+checksum=6336ac492d0f71dfb7a1dd8f4d78eae17aa57a34f743d4e5ba9814991c2da7ae
 replaces="transfig>=0"
 
 post_install() {

From 018f746229aa214ca5dc7f921aea0724dc87ab0f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Mar 2021 19:23:49 +0200
Subject: [PATCH 0080/2024] xfig: update to 3.2.8a.

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

diff --git a/srcpkgs/xfig/template b/srcpkgs/xfig/template
index 1b1efbebe373..4c316f35b32d 100644
--- a/srcpkgs/xfig/template
+++ b/srcpkgs/xfig/template
@@ -1,6 +1,6 @@
 # Template file for 'xfig'
 pkgname=xfig
-version=3.2.8
+version=3.2.8a
 revision=1
 build_style="gnu-configure"
 hostmakedepends="fig2dev ghostscript netpbm"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT-like"
 homepage="http://mcj.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz"
-checksum=dc2f4fb8d3fc119da5c9d4db89cd1607c49fad74436965253612d80e2eaeeab3
+checksum=ba43c0ea85b230d3efa5a951a3239e206d0b033d044c590a56208f875f888578
 
 post_extract() {
 	sed -i 's/spell/aspell/' app-defaults/Fig.in

From 4fe595ca262024b645cbd531d8574a336da1ff69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 28 Mar 2021 19:54:17 +0200
Subject: [PATCH 0081/2024] croc: update to 8.6.12.

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

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 4eaef4d70405..47e8934f081a 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=8.6.11
+version=8.6.12
 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=31df18c9fc38a26aeeab0d12e57f34feba602a3ce6f4a5a0474b46a50df3b459
+checksum=8596a70226437178cd87f271d6ad275d6ba391917b1a09c429bc9dc65f446ed4
 
 post_install() {
 	vlicense LICENSE

From aa9b7a02fa00164c50edd55035748a7733509d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 27 Mar 2021 07:05:15 +0100
Subject: [PATCH 0082/2024] lazydocker: update to 0.12.

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

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 61b4966078ed..9b058006b876 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,6 +1,6 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
-version=0.10
+version=0.12
 revision=1
 wrksrc="lazydocker-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazydocker"
 distfiles="https://github.com/jesseduffield/lazydocker/archive/v${version}.tar.gz"
-checksum=4843347efcb165506c1739584037296c977cb46d167788fd339f49d8946a14e1
+checksum=0509fdfffe78a0155cb54f8bbec1c3f9f3791ea5cbf397fb50fa5278954b2fcb
 
 post_install() {
 	vlicense LICENSE

From 6f5edc85638c3e78563032c6bbab6d056ee16c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 5 Feb 2021 06:22:59 +0100
Subject: [PATCH 0083/2024] gifski: update to 1.3.3.

---
 srcpkgs/gifski/template | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index 756b00a62471..f568d7ac1c6a 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,16 +1,30 @@
 # Template file for 'gifski'
 pkgname=gifski
-version=1.2.7
+version=1.3.3
 revision=1
 build_style=cargo
-configure_args="--features=openmp"
-makedepends="libgomp-devel libomp-devel"
+configure_args="--features=video,openmp"
+hostmakedepends="pkg-config clang llvm ffmpeg-devel"
+makedepends="libgomp-devel libomp-devel ffmpeg-devel"
 short_desc="Highest-quality GIF encoder based on pngquant"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="AGPL-3.0-only"
 homepage="https://gif.ski"
 distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz"
-checksum=4894f70c351ce8440c9cdaca30f3bd59630dc10ce4bb60bc7686fe3f4bcf641c
+checksum=ef8df6c5224c29eed8c011c464826137717fac22b3b1eb123829e7aa93defa11
+
+if [ "$CROSS_BUILD" ]; then
+	export HOST_CC="$BUILD_CC"
+	case "$XBPS_TARGET_MACHINE" in
+	armv7l)
+		export HOST_CCFLAGS="$BUILD_CFLAGS -mfloat-abi=hard"
+		;;
+	*)
+		export HOST_CFLAGS="$BUILD_CFLAGS"
+		;;
+	esac
+	export BINDGEN_EXTRA_CLANG_ARGS="--target=${XBPS_CROSS_TRIPLET} --sysroot=/usr/${XBPS_CROSS_TRIPLET}"
+fi
 
 post_install() {
 	vlicense LICENSE

From 03a9aef86087f6ad7ff5cd9ff3794c2503346ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 13 Mar 2021 07:57:08 +0000
Subject: [PATCH 0084/2024] Update to 1.4.0, drop the video support.

---
 srcpkgs/gifski/template | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index f568d7ac1c6a..3e2537f258dc 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,30 +1,16 @@
 # Template file for 'gifski'
 pkgname=gifski
-version=1.3.3
+version=1.4.0
 revision=1
 build_style=cargo
-configure_args="--features=video,openmp"
-hostmakedepends="pkg-config clang llvm ffmpeg-devel"
-makedepends="libgomp-devel libomp-devel ffmpeg-devel"
+configure_args="--features=openmp"
+makedepends="libgomp-devel libomp-devel"
 short_desc="Highest-quality GIF encoder based on pngquant"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="AGPL-3.0-only"
 homepage="https://gif.ski"
 distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz"
-checksum=ef8df6c5224c29eed8c011c464826137717fac22b3b1eb123829e7aa93defa11
-
-if [ "$CROSS_BUILD" ]; then
-	export HOST_CC="$BUILD_CC"
-	case "$XBPS_TARGET_MACHINE" in
-	armv7l)
-		export HOST_CCFLAGS="$BUILD_CFLAGS -mfloat-abi=hard"
-		;;
-	*)
-		export HOST_CFLAGS="$BUILD_CFLAGS"
-		;;
-	esac
-	export BINDGEN_EXTRA_CLANG_ARGS="--target=${XBPS_CROSS_TRIPLET} --sysroot=/usr/${XBPS_CROSS_TRIPLET}"
-fi
+checksum=8a82b9e6a8bb376049018bc7fa3dd21c68e5bceb44b385948e761ccdfd73830d
 
 post_install() {
 	vlicense LICENSE

From 1fe18187a49d7526c2520bd5ba46e305bc2f29eb Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 10:58:31 -0500
Subject: [PATCH 0085/2024] 3mux: update to 1.1.0.

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

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 7aeea8f5272c..8de2972144cb 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,6 +1,6 @@
 # Template file for '3mux'
 pkgname=3mux
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
@@ -9,7 +9,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"
 homepage="https://github.com/aaronjanse/3mux"
 distfiles="https://github.com/aaronjanse/3mux/archive/v${version}.tar.gz"
-checksum=925e23850ad69ce12069bb4c48af6e70c820bbd4bfe5a83ebf72eaefb9d8ab83
+checksum=0f4dae181914c73eaa91bdb21ee0875f21b5da64c7c9d478f6d52a2d0aa2c0ea
 
 post_install() {
 	vlicense LICENSE

From f56c367d50d5e0ed14c14ab2613ef6343e92364b Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 12:15:02 -0500
Subject: [PATCH 0086/2024] perl-Test-Simple: update to 1.302183.

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

diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index 5f13073d979a..22dd0cfcae48 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Simple'
 pkgname=perl-Test-Simple
-version=1.302175
-revision=2
+version=1.302183
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Simple"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=c8c8f5c51ad6d7a858c3b61b8b658d8e789d3da5d300065df0633875b0075e49
+checksum=9a03bda5ec420aea9692b650437f4d5b574fa505fdd7ff60cdb5f3ec034106ff

From 6420dc504a19ecd639ef7b8f08045527e9a8ba4c Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 12:16:55 -0500
Subject: [PATCH 0087/2024] perl-Moo: update to 2.005003.

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

diff --git a/srcpkgs/perl-Moo/template b/srcpkgs/perl-Moo/template
index d8c2cbd56829..daeccff1bfbb 100644
--- a/srcpkgs/perl-Moo/template
+++ b/srcpkgs/perl-Moo/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Moo'
 pkgname=perl-Moo
-version=2.004000
-revision=2
+version=2.005003
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -15,4 +15,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Moo"
 distfiles="https://cpan.org/authors/id/H/HA/HAARG/Moo-${version}.tar.gz"
-checksum=323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834
+checksum=bcb5ff4a4f806647ce16e1cbf85bdc0ab5d1e7ae3dc224ab6bcc774bc2e82b43

From af522ee38708c25fbe794c8d7124792f8107bae1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Mar 2021 12:24:47 -0500
Subject: [PATCH 0088/2024] Amass: update to 3.11.12.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index ebeafa84e45c..05d7ef6765fe 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.10
+version=3.11.12
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=4e2b898c12e733922738c56305fffb509ccacd2dd74a91dc2fd39fcc1564080f
+checksum=27fef5b24b8b3be5b3f6843b61265447afaa19b649e4cc9e947abc296c2c3184

From 71d04a6ca492c65cbe3faf526851e680bd44a4a0 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 12:12:39 -0500
Subject: [PATCH 0089/2024] perl-File-Slurp: update to 9999.32.

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

diff --git a/srcpkgs/perl-File-Slurp/template b/srcpkgs/perl-File-Slurp/template
index 1d0485bcd408..cfa562b4801a 100644
--- a/srcpkgs/perl-File-Slurp/template
+++ b/srcpkgs/perl-File-Slurp/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-File-Slurp'
 pkgname=perl-File-Slurp
-version=9999.30
-revision=2
+version=9999.32
+revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Slurp"
 distfiles="${CPAN_SITE}/File/${pkgname#perl-}-${version}.tar.gz"
-checksum=2a37163db0b9454e48eb308dac1fc27571be086e0864c9083bed88d9c4e93747
+checksum=4c3c21992a9d42be3a79dd74a3c83d27d38057269d65509a2f555ea0fb2bc5b0

From 5d3ebe0498dd1b0780a485f3d0cd80dac998ea9a Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 12:10:29 -0500
Subject: [PATCH 0090/2024] perl-Glib-Object-Introspection: update to 0.049.

---
 srcpkgs/perl-Glib-Object-Introspection/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Glib-Object-Introspection/template b/srcpkgs/perl-Glib-Object-Introspection/template
index 86a90a645728..78d7556867b7 100644
--- a/srcpkgs/perl-Glib-Object-Introspection/template
+++ b/srcpkgs/perl-Glib-Object-Introspection/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Glib-Object-Introspection'
 pkgname=perl-Glib-Object-Introspection
-version=0.048
-revision=3
+version=0.049
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl-ExtUtils-PkgConfig perl-ExtUtils-Depends perl-Glib"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://metacpan.org/release/Glib-Object-Introspection"
 distfiles="${CPAN_SITE}/Glib/Glib-Object-Introspection-${version}.tar.gz"
-checksum=a64f100c21b884616669255d90fcaf1d11a51cde6ff3f3edcb835a920d2fbd05
+checksum=464628cb9dd028b10438c23892de6f8a30202355a4e4eb01bfd13b8cfe35af57

From 62f2e70a26cdc129bb9c5814b11c08f3a61ae4a3 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 12:18:32 -0500
Subject: [PATCH 0091/2024] perl-Test-MockModule: update to 0.176.0.

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

diff --git a/srcpkgs/perl-Test-MockModule/template b/srcpkgs/perl-Test-MockModule/template
index 2fc20bcba6be..0b306844aab0 100644
--- a/srcpkgs/perl-Test-MockModule/template
+++ b/srcpkgs/perl-Test-MockModule/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-MockModule'
 pkgname=perl-Test-MockModule
-version=0.172.0
-revision=2
+version=0.176.0
+revision=1
 wrksrc="${pkgname/perl-/}-v${version}"
 build_style=perl-ModuleBuild
 hostmakedepends="perl-Module-Build"
@@ -13,4 +13,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-MockModule"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-v${version}.tar.gz"
-checksum=595b61eee8b70623c312ce33140ef2c2ba9285f9a35128367331bedbe33543b9
+checksum=b71e16657c71b682f045e04d115bd532b85d7a96091e7319a1a85447ff97326e

From 54d5ae8c2c0f82b60aac9bde9e333a9cfe061401 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 12:07:58 -0500
Subject: [PATCH 0092/2024] perl-IO-Tty: update to 1.16.

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

diff --git a/srcpkgs/perl-IO-Tty/template b/srcpkgs/perl-IO-Tty/template
index fa3432f2cb7e..2770433ca0f3 100644
--- a/srcpkgs/perl-IO-Tty/template
+++ b/srcpkgs/perl-IO-Tty/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-IO-Tty'
 pkgname=perl-IO-Tty
-version=1.14
-revision=2
+version=1.16
+revision=1
 wrksrc="IO-Tty-$version"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Tty"
 distfiles="${CPAN_SITE}/IO/IO-Tty-$version.tar.gz"
-checksum=51f3e4e311128bdb2c6a15f02c51376cb852ccf9df9bebe8dfbb5f9561eb95b5
+checksum=8f1a09c070738adc695df903f2e7f74308dd8d991b914c0bc390a0e6021294dd

From fe5ab8183e27d64f6e946825bf23cf936be08ab7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 12:05:53 -0500
Subject: [PATCH 0093/2024] perl-HTTP-Message: update to 6.29.

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

diff --git a/srcpkgs/perl-HTTP-Message/template b/srcpkgs/perl-HTTP-Message/template
index e7d76f1c0a77..f6b27ec1d003 100644
--- a/srcpkgs/perl-HTTP-Message/template
+++ b/srcpkgs/perl-HTTP-Message/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-HTTP-Message'
 pkgname=perl-HTTP-Message
-version=6.28
+version=6.29
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTTP-Message"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Message-$version.tar.gz"
-checksum=04e3168f9576b48d45124ac681a574408ebb6fa8eb2dba6d3fe70c8f6704dbb8
+checksum=f4417970679e08f6deb0609009aa9515dee0c8d91dbadd6b86a26e2b8e0d6341

From e40eb6e29419e664af07295ec2f5cd36c927b737 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 11:34:28 -0500
Subject: [PATCH 0094/2024] perl-Glib: update to 1.3293.

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

diff --git a/srcpkgs/perl-Glib/template b/srcpkgs/perl-Glib/template
index 2b1aee1f26dc..d811f9fdd7b7 100644
--- a/srcpkgs/perl-Glib/template
+++ b/srcpkgs/perl-Glib/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Glib'
 pkgname=perl-Glib
-version=1.3292
-revision=2
+version=1.3293
+revision=1
 wrksrc="Glib-${version}"
 build_style=perl-module
 hostmakedepends="libglib-devel perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Glib-${version}.tar.gz"
-checksum=2f3bf06de572500e168acc6536d04f0066dd2fcbdfc3724cd5e5896d5a39a0e0
+checksum=7316a0c1e7cc5cb3db7211214f45d7bdc2354365a680ac4bd3ac8bf06d1cb500
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" perl-Glib"

From 5835759274a8125abe7df7f0d1014b1ebc018e6e Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 11:07:17 -0500
Subject: [PATCH 0095/2024] perl-Clipboard: update to 0.28.

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

diff --git a/srcpkgs/perl-Clipboard/template b/srcpkgs/perl-Clipboard/template
index ede26432b407..f6bd86fa03a4 100644
--- a/srcpkgs/perl-Clipboard/template
+++ b/srcpkgs/perl-Clipboard/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Clipboard'
 pkgname=perl-Clipboard
-version=0.26
-revision=2
+version=0.28
+revision=1
 wrksrc="Clipboard-${version}"
 build_style=perl-ModuleBuild
 hostmakedepends="perl perl-Module-Build"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl"
 homepage="https://metacpan.org/release/Clipboard"
 distfiles="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Clipboard-${version}.tar.gz"
-checksum=886ae43dc8538f9bfc4e07fdbcf09b7fbd6ee59c31f364618c859de14953c58a
+checksum=9e8d79015194263357c25a0f5d094800fff43bdbf9f8601ec3b0ed5eb0966d26

From e022f1b612e1f8eeac3308492314ced564052512 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 11:14:42 -0500
Subject: [PATCH 0096/2024] haproxy: update to 2.3.8.

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

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index eddfaf0fca0a..39e7eb4f78e1 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.3.7
+version=2.3.8
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -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=31ba7acd0d78367c71b56e4a87c9f11cd235fc5602bc5b84690779120e0a305b
+checksum=2aa2691238dbe6360318673603aecd1041df19d55447172f8cd988780788159c
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From e4a21901821a13af9da747976a15e7daac17d75a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Mar 2021 12:27:57 -0500
Subject: [PATCH 0097/2024] libpst: update to 0.6.76.

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

diff --git a/srcpkgs/libpst/template b/srcpkgs/libpst/template
index 073f6eb5dee2..1b1c3692d3fd 100644
--- a/srcpkgs/libpst/template
+++ b/srcpkgs/libpst/template
@@ -1,6 +1,6 @@
 # Template file for 'libpst'
 pkgname=libpst
-version=0.6.75
+version=0.6.76
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libpst-shared --disable-python"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.five-ten-sg.com/libpst/"
 distfiles="http://www.five-ten-sg.com/libpst/packages/libpst-${version}.tar.gz"
-checksum=4ca98fed8ba208d902c954d82eaf2bf5e071c609df695ec4eb34af110f719987
+checksum=3d291beebbdb48d2b934608bc06195b641da63d2a8f5e0d386f2e9d6d05a0b42
 
 libpst-devel_package() {
 	short_desc+=" - development files"

From 0cf6c19257948f5184544aa28ce81f7734769d69 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Mar 2021 12:21:36 -0500
Subject: [PATCH 0098/2024] python3-rich: update to 10.0.0.

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 77e0f19d70bb..3b9eaac8a2af 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=9.13.0
+version=10.0.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=d59e94a0e3e686f0d268fe5c7060baa1bd6744abca71b45351f5850a3aaa6764
+checksum=4674bd3056a72bb282ad581e3f8092dc110cdcc456b5ba76e34965cb85a69724
 
 post_install() {
 	vlicense LICENSE

From 1f25a3d39824462faca9de7d2f12fb19c2e2ead4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Mar 2021 12:10:39 -0500
Subject: [PATCH 0099/2024] evtx: update to 0.7.1.

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

diff --git a/srcpkgs/evtx/template b/srcpkgs/evtx/template
index c873ebec570d..9649e2f234da 100644
--- a/srcpkgs/evtx/template
+++ b/srcpkgs/evtx/template
@@ -1,6 +1,6 @@
 # Template file for 'evtx'
 pkgname=evtx
-version=0.6.9
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Parser for the Windows XML Event Log (EVTX) format"
@@ -8,4 +8,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/omerbenamram/evtx"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7ebbac7d442adbfdf00783f243b0746067a3d9f1c8f8dbd261b34bd85f3a4af4
+checksum=ef4a543fb2d4ecad44d2a6229934f0723dc3cab9a3b4580f72227e6abef93fee

From beba980d1684a227a9f419fa6f86d3cc79ed735b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Mar 2021 12:40:14 -0500
Subject: [PATCH 0100/2024] stellarium: update to 0.21.0.

---
 srcpkgs/stellarium-data     |  1 -
 srcpkgs/stellarium/template | 14 ++++----------
 2 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/stellarium-data

diff --git a/srcpkgs/stellarium-data b/srcpkgs/stellarium-data
deleted file mode 120000
index 71837d9b7281..000000000000
--- a/srcpkgs/stellarium-data
+++ /dev/null
@@ -1 +0,0 @@
-stellarium
\ No newline at end of file
diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index 8b7efd36a109..188f87a3d397 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,22 +1,16 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=0.20.4
+version=0.21.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt5-qmake qt5-host-tools"
 makedepends="qt5-location-devel qt5-multimedia-devel qt5-script-devel
  qt5-serialport-devel qt5-tools-devel"
-depends="desktop-file-utils ${pkgname}-data"
+depends="desktop-file-utils"
 short_desc="Open Source Planetarium"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://stellarium.org/"
 distfiles="https://github.com/Stellarium/stellarium/releases/download/v${version}/stellarium-${version}.tar.gz"
-checksum=63033bb6ad01b5f021689766b2a09a99bcabcfec57a710e46a93c40a32fda388
-
-stellarium-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/stellarium
-	}
-}
+checksum=977fcd6776a47d34b1646727853d15968a1410c34c8ba1b3e5cfbf24b5126f13
+replaces="stellarium-data>=0"

From f60a588472a767f010823c494c9808e13e111f63 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 7 Jan 2021 09:53:02 +0100
Subject: [PATCH 0101/2024] New package: lagrange-1.2.2

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

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
new file mode 100644
index 000000000000..97dea0e2bc0a
--- /dev/null
+++ b/srcpkgs/lagrange/template
@@ -0,0 +1,18 @@
+# Template file for 'lagrange'
+pkgname=lagrange
+version=1.2.2
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="pcre-devel SDL2-devel openssl-devel zlib-devel libunistring-devel mpg123-devel libcurl-devel"
+short_desc="Beautiful Gemini Client"
+maintainer="Paper <paper@tilde.institute>"
+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=66f7d06359c8d2de72787b02062d9bf4190a8667b6dd00b329b9bb6549bdac55
+
+post_install() {
+	vlicense LICENSE.md
+}

From 20b7d18fdaa272c4ec9c3ceb64febd54913ea6d7 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, 29 Mar 2021 07:14:43 +0700
Subject: [PATCH 0102/2024] New package: python3-makefun-1.11.2

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

diff --git a/srcpkgs/python3-makefun/template b/srcpkgs/python3-makefun/template
new file mode 100644
index 000000000000..f1562b39e78a
--- /dev/null
+++ b/srcpkgs/python3-makefun/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-makefun'
+pkgname=python3-makefun
+version=1.11.2
+revision=1
+wrksrc=makefun-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Small library to dynamically create python functions"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/smarie/python-makefun"
+distfiles="${PYPI_SITE}/m/makefun/makefun-${version}.tar.gz"
+checksum=daa350a482ed58b5724443c651432191e9b97b0c83743879d0913171c6a28085

From 33c2caf0b52c46bf574b0ae9b0b15e4657bf015f 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, 29 Mar 2021 06:24:58 +0700
Subject: [PATCH 0103/2024] yubikey-manager: update to 4.0.0.

---
 srcpkgs/yubikey-manager/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template
index 1946f6cab49c..4d0cb26e223c 100644
--- a/srcpkgs/yubikey-manager/template
+++ b/srcpkgs/yubikey-manager/template
@@ -1,19 +1,18 @@
 # Template file for 'yubikey-manager'
 pkgname=yubikey-manager
-version=3.1.1
-revision=5
+version=4.0.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="libfido2 python3-fido2 python3-openssl python3-usb python3-pyscard
- python3-click python3-cryptography python3-six pcsc-ccid python3-setuptools
- libykpers"
-checkdepends="$depends python3-pytest"
+depends="libfido2 python3-click python3-fido2 python3-openssl
+ python3-setuptools"
+checkdepends="$depends python3-pytest python3-makefun"
 short_desc="Library and CLI tools to configure YubiKey"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://developers.yubico.com/yubikey-manager/"
 distfiles="https://developers.yubico.com/${pkgname}/Releases/${pkgname}-${version}.tar.gz"
-checksum=68ef41ac3cd2e891019e755a492427ecdd63d8816525d05f2f32c37b8c440cfa
+checksum=ab7a953ceb6f5de4487c20c02672cf7ee19ab49f0b99a9ae2f1cfa06a5d64a44
 
 post_install() {
 	vlicense COPYING

From e567eaebd407487c41a9a46e057dbf4f1d742cd2 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 28 Mar 2021 22:35:56 -0700
Subject: [PATCH 0104/2024] sway: patch for popup menu flickers with Firefox

---
 srcpkgs/sway/patches/6046.patch | 133 ++++++++++++++++++++++++++++++++
 srcpkgs/sway/template           |   3 +-
 2 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sway/patches/6046.patch

diff --git a/srcpkgs/sway/patches/6046.patch b/srcpkgs/sway/patches/6046.patch
new file mode 100644
index 000000000000..34845cd99b59
--- /dev/null
+++ b/srcpkgs/sway/patches/6046.patch
@@ -0,0 +1,133 @@
+Upstream: yes
+Source: https://github.com/swaywm/sway/pull/6046
+Reason: Popup menu flickers on Firefox
+(https://bugzilla.mozilla.org/show_bug.cgi?id=1696662)
+
+From cf03185561e919f1c337f087194fec150425eef5 Mon Sep 17 00:00:00 2001
+From: Kenny Levinsen <kl@kl.wtf>
+Date: Fri, 19 Feb 2021 18:39:54 +0100
+Subject: [PATCH 1/3] view: Recursively check mapped of view_child tree
+
+A subsurface may be set to mapped without its parent.
+---
+ sway/tree/view.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/sway/tree/view.c b/sway/tree/view.c
+index ad79b2294..c8a4ea6b6 100644
+--- a/sway/tree/view.c
++++ b/sway/tree/view.c
+@@ -982,8 +982,18 @@ static void view_child_subsurface_create(struct sway_view_child *child,
+ 	view_child_damage(&subsurface->child, true);
+ }
+ 
++static bool view_child_is_mapped(struct sway_view_child *child) {
++	while (child) {
++		if (!child->mapped) {
++			return false;
++		}
++		child = child->parent;
++	}
++	return true;
++}
++
+ static void view_child_damage(struct sway_view_child *child, bool whole) {
+-	if (!child || !child->mapped || !child->view || !child->view->container) {
++	if (!child || !view_child_is_mapped(child) || !child->view || !child->view->container) {
+ 		return;
+ 	}
+ 	int sx, sy;
+@@ -1082,7 +1092,7 @@ void view_child_init(struct sway_view_child *child,
+ }
+ 
+ void view_child_destroy(struct sway_view_child *child) {
+-	if (child->mapped && child->view->container != NULL) {
++	if (view_child_is_mapped(child) && child->view->container != NULL) {
+ 		view_child_damage(child, true);
+ 	}
+ 
+
+From e2ec65d0a32797edd0846758bc24cf685e2d19d5 Mon Sep 17 00:00:00 2001
+From: Kenny Levinsen <kl@kl.wtf>
+Date: Fri, 19 Feb 2021 18:41:04 +0100
+Subject: [PATCH 2/3] view: Mark subchildren as unmapped in view_child_destroy
+
+The subchildren lose their parent association at this point, so they
+will not be able to see that the parent is unmapped.
+
+Instead, just set the subchildren to be unmapped directly.
+---
+ sway/tree/view.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sway/tree/view.c b/sway/tree/view.c
+index c8a4ea6b6..978271c24 100644
+--- a/sway/tree/view.c
++++ b/sway/tree/view.c
+@@ -1105,6 +1105,9 @@ void view_child_destroy(struct sway_view_child *child) {
+ 	wl_list_for_each_safe(subchild, tmpchild, &child->children, link) {
+ 		wl_list_remove(&subchild->link);
+ 		subchild->parent = NULL;
++		// The subchild lost its parent link, so it cannot see that the parent
++		// is unmapped. Unmap it directly.
++		subchild->mapped = false;
+ 	}
+ 
+ 	wl_list_remove(&child->surface_commit.link);
+
+From c06a926e0d89e952e5a3892b63f07d5b802b34ef Mon Sep 17 00:00:00 2001
+From: Kenny Levinsen <kl@kl.wtf>
+Date: Fri, 19 Feb 2021 18:33:20 +0100
+Subject: [PATCH 3/3] view: Set parent for view_child subsurfaces on init
+
+view_child_init was calling view_init_subsurfaces, which did not set the
+parent attribute for the subchildren. This lead to the subchildren
+acting as standalone children. If the parent was an xdg_popup, this
+would make the subchild unaware of the popup position.
+
+Introduce view_child_init_subsurfaces for view_child_init to use
+instead.
+
+Closes: https://github.com/swaywm/sway/issues/6038
+---
+ sway/tree/view.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/sway/tree/view.c b/sway/tree/view.c
+index 978271c24..8a2a8178d 100644
+--- a/sway/tree/view.c
++++ b/sway/tree/view.c
+@@ -465,6 +465,9 @@ static void view_subsurface_create(struct sway_view *view,
+ static void view_init_subsurfaces(struct sway_view *view,
+ 	struct wlr_surface *surface);
+ 
++static void view_child_init_subsurfaces(struct sway_view_child *view_child,
++	struct wlr_surface *surface);
++
+ static void view_handle_surface_new_subsurface(struct wl_listener *listener,
+ 		void *data) {
+ 	struct sway_view *view =
+@@ -1033,6 +1036,14 @@ static void view_init_subsurfaces(struct sway_view *view,
+ 	}
+ }
+ 
++static void view_child_init_subsurfaces(struct sway_view_child *view_child,
++		struct wlr_surface *surface) {
++	struct wlr_subsurface *subsurface;
++	wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) {
++		view_child_subsurface_create(view_child, subsurface);
++	}
++}
++
+ static void view_child_handle_surface_map(struct wl_listener *listener,
+ 		void *data) {
+ 	struct sway_view_child *child =
+@@ -1088,7 +1099,7 @@ void view_child_init(struct sway_view_child *child,
+ 		wlr_surface_send_enter(child->surface, workspace->output->wlr_output);
+ 	}
+ 
+-	view_init_subsurfaces(child->view, surface);
++	view_child_init_subsurfaces(child, surface);
+ }
+ 
+ void view_child_destroy(struct sway_view_child *child) {
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 98ade688f1e0..2858c7026b56 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.5.1
-revision=1
+revision=2
 build_style=meson
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -14,6 +14,7 @@ license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
 checksum=095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f
+patch_args="-Np1"
 
 post_patch() {
 	vsed -e 's/werror=true/werror=false/g' -i meson.build

From 09914ac869c6f389d993fa97282916058ccf3a79 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 29 Mar 2021 13:37:34 +0300
Subject: [PATCH 0105/2024] notcurses: update to 2.2.4.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 1932bd050acc..3f6846660b15 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.2.3
+version=2.2.4
 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=007b13c3b67de5c86b0004d29b414c0e8bd1c80a7bf00f208423cb1db5fd9e62
+checksum=f062b4a86ab61e800c8754cd36af557f41ac8a015e3fe3921dab1ed37c665394
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 73978ae43f76ef1593f742fe43bb3ebc6c394ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 29 Mar 2021 09:00:35 -0300
Subject: [PATCH 0106/2024] sqlite: update to 3.35.3.

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

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 69ca9d872c14..84116b6e638d 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.34.1
+version=3.35.3
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,7 +13,7 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2021/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=2a3bca581117b3b88e5361d0ef3803ba6d8da604b1c1a47d902ef785c1b53e89
+checksum=ecbccdd440bdf32c0e1bb3611d635239e3b5af268248d130d0445a32daf0274b
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

From 2ac2afc27d94f09f33b7ca5c984b6d822b20176d Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 29 Mar 2021 09:12:21 +0200
Subject: [PATCH 0107/2024] py3status: update to 3.35.

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

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 0f8896d4384d..dbc52049950e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.34
+version=3.35
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f1234e72cda0a792c3d71da3de3a3752ed3462b62793f6a1204372234a5d2521
+checksum=8069e35ff7dead4feecdd714b6c36985c4dbfd2cc133ff0ae6d190e99549f55b
 
 do_check() {
 	python3 -m pytest

From c1d4e3a6562044f157b4b1de23b73e66476135f1 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 29 Mar 2021 09:22:55 +0200
Subject: [PATCH 0108/2024] leocad: update to 21.03.

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

diff --git a/srcpkgs/leocad/template b/srcpkgs/leocad/template
index 9981eaeb3672..7baadb9179d5 100644
--- a/srcpkgs/leocad/template
+++ b/srcpkgs/leocad/template
@@ -1,6 +1,6 @@
 # Template file for 'leocad'
 pkgname=leocad
-version=21.01
+version=21.03
 revision=1
 _lib_version=20.03
 build_style=qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-only, CC-BY-2.0"
 homepage="http://leocad.org"
 distfiles="https://github.com/leozide/${pkgname}/archive/v${version}.tar.gz
  https://github.com/leozide/leocad/releases/download/v${version}/Library-${_lib_version}.zip"
-checksum="d57576ced3855e1b57aa7e310c81929505db57e88a891094972579b2481bf0d6
+checksum="af7e59fe8367a88a3721a125b021ecba1eb9628eed928bdea7a37b6d41c7ccd6
  88d6d28b3a494a15ae63e984c1e732e28362fabc2e145ffab828fed2eb5e3632"
 
 leocad-data_package() {

From 2e844a113656fc46b16a1c91bdd204aa55feb347 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 28 Mar 2021 11:28:16 -0500
Subject: [PATCH 0109/2024] fuse-mp3fs: update to 1.1.1.

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

diff --git a/srcpkgs/fuse-mp3fs/template b/srcpkgs/fuse-mp3fs/template
index 09d11682cd84..86b1bbfdc2fb 100644
--- a/srcpkgs/fuse-mp3fs/template
+++ b/srcpkgs/fuse-mp3fs/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse-mp3fs'
 pkgname=fuse-mp3fs
-version=1.0
+version=1.1.1
 revision=1
 wrksrc="mp3fs-${version}"
 build_style=gnu-configure
@@ -11,4 +11,5 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://khenriks.github.io/mp3fs/"
 distfiles="https://github.com/khenriks/mp3fs/releases/download/v${version}/mp3fs-${version}.tar.gz"
-checksum=cbb52062d712e8dfd3491d0b105e2e05715d493a0fd14b53a23919694a348069
+checksum=942b588fb623ea58ce8cac8844e6ff2829ad4bc9b4c163bba58e3fa9ebc15608
+make_check=no # checks require fuse + mount/unmount privileges

From 348f8aef7d4d93238b626818ab18523e7f115733 Mon Sep 17 00:00:00 2001
From: Dominik Schulz <mail@dschulz.eu>
Date: Sat, 27 Mar 2021 21:54:01 +0100
Subject: [PATCH 0110/2024] gopass: update to 1.12.5

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
---
 srcpkgs/gopass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 887985426b3a..613c7c9a6936 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,6 +1,6 @@
 # Template file for 'gopass'
 pkgname=gopass
-version=1.12.4
+version=1.12.5
 revision=1
 build_style=go
 build_helper=qemu
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://www.gopass.pw/"
 changelog="https://raw.githubusercontent.com/gopasspw/gopass/master/CHANGELOG.md"
 distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz"
-checksum=1e3d7ad389a8462256ff7e439de1fbed8012c38ec33bded63b11af74f0525279
+checksum=2c30167cfdd3b8b540d26c08885eee0cd2ad6333a49a4861ff33972890a9df02
 
 post_install() {
 	vlicense LICENSE

From 3bd18196f6b6a12cd881dfd1daf303a33c015696 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 29 Mar 2021 09:13:46 -0400
Subject: [PATCH 0111/2024] hikari: update to 2.2.3.

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

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 0828aa3aaded..093d55610b0b 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,7 +1,7 @@
 # Template file for 'hikari'
 pkgname=hikari
-version=2.2.2
-revision=2
+version=2.2.3
+revision=1
 build_style=gnu-makefile
 make_cmd=bmake
 make_use_env=yes
@@ -16,7 +16,7 @@ license="BSD-2-Clause"
 homepage="https://hikari.acmelabs.space"
 changelog="https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
-checksum=df9b8cb6c6b2b995a5dd4bbf32c43b374d689eabfda1620a9444d845160e4de3
+checksum=0727d8652e6debea52a9d975bd656cb573556e0e14184b069925c40f2f1b02b4
 conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
 
 pre_build() {

From a588633b9f3785bcbf62699999ca935bf75f869b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 29 Mar 2021 09:21:51 -0400
Subject: [PATCH 0112/2024] python3-hypothesis: update to 6.8.3.

---
 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 8ae7e8d2d1d3..474b9fb2ccf9 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.8.1
+version=6.8.3
 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=4f1f45ab866baa9c25386dfafc31f128dc53874e81a6ea202e7e53c15a14afb7
+checksum=2fcdfa36306b944164326e9e7e3d29926c9521b3618e2b8bfa099f4cf1a3d9e1
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 7382fb0ec52553f9b7d0fa67ead0f4493bc16fd6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 29 Mar 2021 09:25:33 -0400
Subject: [PATCH 0113/2024] python3-ipython: update to 7.22.0.

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

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 453b863e0fa5..0d1f20a5366d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.21.0
+version=7.22.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=04323f72d5b85b606330b6d7e2dc8d2683ad46c3905e955aa96ecc7a99388e70
+checksum=9c900332d4c5a6de534b4befeeb7de44ad0cc42e8327fa41b7685abde58cec74
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From b1fd0d5724895a120164c7bbfd2c8eb9c0b439ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 29 Mar 2021 09:27:17 -0400
Subject: [PATCH 0114/2024] python3-matplotlib: update to 3.4.0.

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

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 095a661d60ca..9319a10f0fac 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.3.4
+version=3.4.0
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -10,12 +10,14 @@ makedepends="python3-devel freetype-devel libpng-devel libqhull-devel"
 depends="python3-certifi python3-cycler python3-kiwisolver
  python3-numpy python3-Pillow python3-parsing python3-dateutil"
 short_desc="Python3 2D/3D plotting library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+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=ce7cebd3df11a032fff9b3a32029f49f0fc7c322f556f26ea9ef812d6e43cb21
+checksum=a145cd4ec257fd659c4950a4485a860836f1ad615add756a4dcb203fad80c4cb
 replaces="python3-matplotlib-data>=0"
+# Comparison of images is too frail for validation
+make_check="no"
 
 pre_build() {
 	cat <<-EOF > setup.cfg
@@ -25,10 +27,6 @@ pre_build() {
 	EOF
 }
 
-do_check() {
-	echo "Skipping check: comparison of images is too frail for validation"
-}
-
 post_install() {
 	vdoc "${FILESDIR}/README.voidlinux"
 	vlicense LICENSE/LICENSE

From fbce4c8fd02b2c97a441a84171f529ee1397fff4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 29 Mar 2021 09:38:02 -0400
Subject: [PATCH 0115/2024] python3-numpy: update to 1.20.2.

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

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index a2d0c201a66a..e6887934b974 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.20.1
+version=1.20.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,8 +13,10 @@ 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=faadd54211fe33ec569795d29ce7662ec6b342b8778822a7658386de541101b4
+checksum=f2431c82e2d0ee1a7dba3abd26b9e80d8d3cfa620e8b37e7d95991ad6c785834
 alternatives="numpy:f2py:/usr/bin/f2py3"
+# Tests do not function propery in a build directory
+make_check="no"
 
 build_options="openblas"
 
@@ -70,10 +72,6 @@ pre_build() {
 	done
 }
 
-do_check() {
-	echo "Skipping check: tests do not function properly in builddir"
-}
-
 post_install() {
 	# create compat symlinks for .h files
 	vmkdir ${py3_inc}

From cf440624e363aa0e0cfd1bf97682d7ca431fb16d 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, 2 Feb 2021 22:30:30 +0700
Subject: [PATCH 0116/2024] anthy: update to 0.4.

---
 common/shlibs          |  6 +++---
 srcpkgs/anthy/template | 35 +++++++++++++++++++++++------------
 srcpkgs/libanthy       |  1 +
 3 files changed, 27 insertions(+), 15 deletions(-)
 create mode 120000 srcpkgs/libanthy

diff --git a/common/shlibs b/common/shlibs
index 7319cc8d20cb..3a9f74b6acb9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2325,9 +2325,9 @@ libIL.so.1 devil-1.7.8_1
 libILU.so.1 devil-1.7.8_1
 libILUT.so.1 devil-1.7.8_1
 liboath.so.0 oath-toolkit-2.6.0_2
-libanthy.so.0 anthy-9100h_1
-libanthydic.so.0 anthy-9100h_1
-libanthyinput.so.0 anthy-9100h_1
+libanthy.so.1 libanthy-0.4_1
+libanthydic.so.1 libanthy-0.4_1
+libanthyinput.so.0 libanthy-0.4_1
 libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
 libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
diff --git a/srcpkgs/anthy/template b/srcpkgs/anthy/template
index 15ab07d942e1..a4f6b13c6018 100644
--- a/srcpkgs/anthy/template
+++ b/srcpkgs/anthy/template
@@ -1,26 +1,37 @@
 # Template file for 'anthy'
 pkgname=anthy
-version=9100h
-revision=2
-_filecode=37536
-conf_files="/etc/anthy-conf"
+reverts="9100h_1 9100h_2"
+version=0.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 short_desc="Hiragana text to Kana Kanji mixed text Japanese input method"
 maintainer="7185 <7185@free.fr>"
-license="LGPL-2.1"
-homepage="http://osdn.jp/projects/anthy/"
-distfiles="http://dl.sourceforge.jp/anthy/${_filecode}/${pkgname}-${version}.tar.gz"
-checksum="d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547"
-# Would need to build lt-mkdepgraph for the host
-nocross=yes
+# src-worddic/textdic.c is LGPL-3.0+
+# alt-cannadic is GPL-2, corpus: Public Domain
+license="LGPL-3.0-or-later, GPL-2.0-only, Public Domain"
+homepage="https://wiki.debian.org/Teams/DebianAnthy"
+distfiles="$DEBIAN_SITE/main/a/anthy/anthy_${version}.orig.tar.gz"
+checksum=fdf590beea7093f3327b1eee76013e4936e4c6659e7cc01dd1fdd6e6f2e9c9f7
+nocross="need to run lt-mkdepgraph"
+
+libanthy_package() {
+	short_desc+=" - libraries"
+	conf_files="/etc/anthy-conf"
+	conflicts="anthy-9100h_1 anthy-9100h_2"
+	pkg_install() {
+		vmove etc/anthy-conf
+		vmove "usr/lib/*.so.*"
+		vmove usr/share
+	}
+}
 
 anthy-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="libanthy-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/libanthy b/srcpkgs/libanthy
new file mode 120000
index 000000000000..b38e2adfa2dc
--- /dev/null
+++ b/srcpkgs/libanthy
@@ -0,0 +1 @@
+anthy
\ No newline at end of file

From ff44103a01a989dc54d035b2c61db989fcc3f570 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, 2 Feb 2021 22:32:37 +0700
Subject: [PATCH 0117/2024] fcitx-anthy: rebuild for anthy 0.4

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

diff --git a/srcpkgs/fcitx-anthy/template b/srcpkgs/fcitx-anthy/template
index cb0c8f2b364a..d03499e83c3e 100644
--- a/srcpkgs/fcitx-anthy/template
+++ b/srcpkgs/fcitx-anthy/template
@@ -1,13 +1,13 @@
 # Template file for 'fcitx-anthy'
 pkgname=fcitx-anthy
 version=0.2.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="anthy-devel fcitx-devel"
 depends="fcitx>=4.2.9"
 short_desc="Fcitx wrapper for Anthy IM engine"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://fcitx-im.org/"
 distfiles="https://github.com/fcitx/fcitx-anthy/archive/${version}.tar.gz"
 checksum=31826a49a7ff743f830e1279527301abce9e669bc176934c76775999299421a8

From 41fb8029ddf9c53fbea2c10af97f7cfcdcc81ffc 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, 2 Feb 2021 22:32:37 +0700
Subject: [PATCH 0118/2024] ibus-anthy: rebuild for anthy 0.4

- Build with python3-gobject-devel
- Remove gir build option since it can't be built without.
  Upstream don't provide option to disable
---
 .../0001-read-utf-8-encoded-zipfile.patch     | 25 +++++++++++++++++++
 srcpkgs/ibus-anthy/template                   | 20 +++++++--------
 2 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch

diff --git a/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch b/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch
new file mode 100644
index 000000000000..f84de4770232
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch
@@ -0,0 +1,25 @@
+From: NOKUBI Takatsugu <knok@daionet.gr.jp>
+Date: Thu, 2 Nov 2017 15:11:52 +0900
+Subject: read utf-8 encoded zipfile
+
+---
+ anthy form Debian converted those zipfile to utf-8
+ data/zipcode-textdic.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/zipcode-textdic.py b/data/zipcode-textdic.py
+index 6fa50d6..cb28a1f 100755
+--- data/zipcode-textdic.py
++++ data/zipcode-textdic.py
+@@ -21,9 +21,9 @@ if len(sys.argv) < 2:
+ anthy_zipfile = sys.argv[1]
+ 
+ try:
+-    contents = codecs.open(anthy_zipfile, 'r', 'euc_jp').read()
++    contents = codecs.open(anthy_zipfile, 'r', 'utf-8').read()
+ except UnicodeDecodeError as e:
+-    print('Your file is not eucJP? %s' % anthy_zipfile, file=sys.stderr)
++    print('Your file is not of UTF-8? %s' % anthy_zipfile, file=sys.stderr)
+     contents = open(anthy_zipfile).read()
+ 
+ output_zipfile = codecs.open('zipcode.t', 'w', 'utf-8')
diff --git a/srcpkgs/ibus-anthy/template b/srcpkgs/ibus-anthy/template
index d9d0f92e56a8..9b96fa820633 100644
--- a/srcpkgs/ibus-anthy/template
+++ b/srcpkgs/ibus-anthy/template
@@ -1,11 +1,12 @@
 # Template file for 'ibus-anthy'
 pkgname=ibus-anthy
 version=1.5.11
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--libexec=/usr/lib/ibus $(vopt_enable gir introspection)"
-hostmakedepends="automake gettext $(vopt_if gir gobject-introspection) libtool pkg-config swig"
-makedepends="anthy-devel gettext-devel ibus-devel python-gobject-devel"
+build_helper=gir
+configure_args="--libexec=/usr/lib/ibus"
+hostmakedepends="automake libtool pkg-config swig intltool gettext-devel"
+makedepends="anthy-devel ibus-devel python3-gobject-devel"
 depends="ibus"
 short_desc="Japanese input method Anthy IMEngine for IBus Framework"
 maintainer="7185 <7185@free.fr>"
@@ -13,14 +14,11 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/ibus/ibus/wiki"
 distfiles="https://github.com/ibus/${pkgname}/archive/${version}.tar.gz"
 checksum=57d42a302be72409708274aa680c6d7515077766853a2b9193b9974c9c6eeaf6
+make_check=extended
 
-# Package build options
-build_options="gir"
-
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+post_patch() {
+	2to3 -w gir/test.py
+}
 
 pre_configure() {
 	autoreconf -fi

From 19477f80de2510d3349f2073bdc37a7aa8d0a0bb 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, 4 Feb 2021 22:54:55 +0700
Subject: [PATCH 0119/2024] New package: libgcroots-0.3.2

---
 common/shlibs               |  2 +-
 srcpkgs/libgcroots-devel    |  1 +
 srcpkgs/libgcroots/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libgcroots-devel
 create mode 100644 srcpkgs/libgcroots/template

diff --git a/common/shlibs b/common/shlibs
index 3a9f74b6acb9..3a2c8d27b3a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2919,7 +2919,7 @@ liblxpanel.so.0 lxpanel-0.9.3_1
 libuim.so.8 uim-1.8.6_1
 libuim-scm.so.0 uim-1.8.6_1
 libuim-custom.so.2 uim-1.8.6_1
-libgcroots.so.0 uim-1.8.6_1
+libgcroots.so.0 libgcroots-0.3.2_1
 libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
diff --git a/srcpkgs/libgcroots-devel b/srcpkgs/libgcroots-devel
new file mode 120000
index 000000000000..3f941c40e0f5
--- /dev/null
+++ b/srcpkgs/libgcroots-devel
@@ -0,0 +1 @@
+libgcroots
\ No newline at end of file
diff --git a/srcpkgs/libgcroots/template b/srcpkgs/libgcroots/template
new file mode 100644
index 000000000000..26423de91dc3
--- /dev/null
+++ b/srcpkgs/libgcroots/template
@@ -0,0 +1,28 @@
+# Template file for 'libgcroots'
+pkgname=libgcroots
+version=0.3.2
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+short_desc="GC library for sigscheme Scheme interpreter"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="custom:libgcroots"
+homepage="https://github.com/uim/libgcroots"
+distfiles="https://github.com/uim/libgcroots/releases/download/$version/libgcroots-$version.tar.bz2"
+checksum=b177a1c033bd907ea341db7e46eeee181acb73225bf58ada1966e7b4d50f657f
+
+post_install() {
+	rm -f $DESTDIR/usr/lib/*.la
+	vlicense COPYING
+}
+
+libgcroots-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 11aef9cf59e12d556910c90c2bf21821e1e1de01 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, 2 Feb 2021 22:32:37 +0700
Subject: [PATCH 0120/2024] uim: rebuild for anthy 0.4

Close: #28410
---
 srcpkgs/uim/patches/anthy-0.4.patch           | 13 +++++++
 .../replace_obsolete_since_emacs22.1.patch    | 38 +++++++++++++++++++
 srcpkgs/uim/template                          | 15 ++++++--
 3 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/uim/patches/anthy-0.4.patch
 create mode 100644 srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch

diff --git a/srcpkgs/uim/patches/anthy-0.4.patch b/srcpkgs/uim/patches/anthy-0.4.patch
new file mode 100644
index 000000000000..082bbd764a1b
--- /dev/null
+++ b/srcpkgs/uim/patches/anthy-0.4.patch
@@ -0,0 +1,13 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -124,7 +124,7 @@ AC_ARG_WITH(anthy-utf8,
+   [with_anthy_utf8=no])
+ 
+ if test "x$with_anthy_utf8" != xno; then
+-  PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622,
++  PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4,
+                     [with_anthy_utf8=yes
+                      AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
+                      [libanthy can handle UTF-8])],
diff --git a/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch b/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch
new file mode 100644
index 000000000000..61b28da72088
--- /dev/null
+++ b/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch
@@ -0,0 +1,38 @@
+From 164e2eb050b5fec25033124834cf49ea1a7d8cbb Mon Sep 17 00:00:00 2001
+From: multiSnow <infinity.blick.winkel@gmail.com>
+Date: Thu, 7 Feb 2019 01:03:47 +0800
+Subject: [PATCH] replace process-kill-without-query with
+ set-process-query-on-exit-flag
+
+see https://www.gnu.org/software/emacs/news/NEWS.22.1 and https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=f1c48b0ec521744826ed43ae27eed0e152c472bf
+---
+ emacs/uim-helper.el | 2 +-
+ emacs/uim.el        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git emacs/uim-helper.el emacs/uim-helper.el
+index e86e32d06..19ecd4538 100644
+--- emacs/uim-helper.el
++++ emacs/uim-helper.el
+@@ -106,7 +106,7 @@
+     (if (not proc)
+ 	(error "uim.el: Couldn't invoke uim-el-helper-agent."))
+ 
+-    (process-kill-without-query proc)
++    (set-process-query-on-exit-flag proc nil)
+ 
+     ;; wait "OK"
+     (let ((patience uim-startup-timeout) (ok nil))
+diff --git emacs/uim.el emacs/uim.el
+index 9110c3cb6..7e1fadbba 100644
+--- emacs/uim.el
++++ emacs/uim.el
+@@ -488,7 +488,7 @@
+ 	(error "uim.el: Couldn't invoke uim-el-agent."))
+     
+     ;; don't ask kill
+-    (process-kill-without-query proc)
++    (set-process-query-on-exit-flag proc nil)
+ 
+     ;; wait "OK"
+     (let ((patience uim-startup-timeout) (ok nil))
diff --git a/srcpkgs/uim/template b/srcpkgs/uim/template
index 2aec8fe96059..aeb9aff5e913 100644
--- a/srcpkgs/uim/template
+++ b/srcpkgs/uim/template
@@ -1,13 +1,15 @@
 # Template file for 'uim'
 pkgname=uim
 version=1.8.8
-revision=2
+revision=3
 build_style=gnu-configure
+build_helper=qmake
 configure_args="--enable-pref --enable-fep --with-gtk2 --with-gtk3
  --with-qt5 --with-qt5-immodule --with-x --with-anthy-utf8 --with-skk"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool qt5-host-tools qt5-qmake automake
+ libtool gettext-devel"
 makedepends="gtk+-devel gtk+3-devel qt5-devel ncurses-devel anthy-devel
- qt5-x11extras-devel"
+ libgcroots-devel qt5-x11extras-devel"
 short_desc="Multilingual input method library and environment"
 maintainer="Kazuho Sakoda <hyonhyoro.kazuho@gmail.com>"
 license="BSD-3-Clause"
@@ -17,6 +19,10 @@ checksum=34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
 
 CFLAGS="-fcommon"
 
+pre_configure() {
+	./autogen.sh
+}
+
 post_install() {
 	vlicense COPYING
 }
@@ -24,10 +30,12 @@ post_install() {
 uim-gtk2_package() {
 	short_desc+=" - GTK2 IM module"
 	pkg_install() {
+		vmove usr/bin/uim-input-pad-ja
 		vmove "usr/bin/uim-*-gtk"
 		vmove usr/bin/uim-toolbar-gtk-systray
 		vmove "usr/libexec/uim-*-gtk"
 		vmove usr/lib/gtk-2.0
+		vmove usr/share/applications
 	}
 }
 
@@ -74,7 +82,6 @@ uim-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From efb546c908564507f93e25effa275b26f98f8db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Mon, 29 Mar 2021 15:36:12 +0200
Subject: [PATCH 0121/2024] autotiling: Update to 1.5

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

diff --git a/srcpkgs/autotiling/template b/srcpkgs/autotiling/template
index f28e5c22e563..a325fdf2f703 100644
--- a/srcpkgs/autotiling/template
+++ b/srcpkgs/autotiling/template
@@ -1,6 +1,6 @@
 # Template file for 'autotiling'
 pkgname=autotiling
-version=1.4
+version=1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-wheel"
@@ -10,6 +10,6 @@ maintainer="Adrian Göransson <adriangoransson@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/autotiling"
 distfiles="https://github.com/nwg-piotr/${pkgname}/archive/v${version}.tar.gz"
-checksum=739653ffa8fc1bb5396e3c64cf35e25b343dd0391de5c8e71362c553a86e656f
+checksum=aa7ec1e3efbd409c06002c9229f2c198686bef1f907bc9d811b97a02de6ed0de
 # There is no test suite for this package
 make_check=no

From 8a2b8e3e8144ddd73df501fa2f8d7df4904c319f 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, 29 Mar 2021 21:58:56 +0700
Subject: [PATCH 0122/2024] removed-packages: remove masterpassword-cli

---
 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 342c036a14aa..133a72f3146a 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=38
+revision=39
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -199,6 +199,7 @@ replaces="
  luxrays<=3.1_18
  luxrays-devel<=3.1_18
  mac<=3.99u4b5s7_3
+ masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
  mirrorbits<=0.5.1_1

From c853961b6016867fe46afef11558e2a87f136675 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, 26 Mar 2021 21:14:31 +0700
Subject: [PATCH 0123/2024] masterpassword-cli: hardening + set restricted

---
 .../masterpassword-cli/patches/fix-cflags.patch  | 13 +++++++++++++
 srcpkgs/masterpassword-cli/template              | 16 ++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/masterpassword-cli/patches/fix-cflags.patch

diff --git a/srcpkgs/masterpassword-cli/patches/fix-cflags.patch b/srcpkgs/masterpassword-cli/patches/fix-cflags.patch
new file mode 100644
index 000000000000..a303f6954544
--- /dev/null
+++ b/srcpkgs/masterpassword-cli/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: platform-independent/cli-c/CMakeLists.txt
+===================================================================
+--- platform-independent/cli-c/CMakeLists.txt.orig
++++ platform-independent/cli-c/CMakeLists.txt
+@@ -15,8 +15,6 @@ option( BUILD_MPW_BENCH         "C CLI M
+ option( BUILD_MPW_TESTS         "C Master Password algorithm test suite (needs: mpw_sodium, mpw_xml)." OFF )
+ 
+ # Default build flags.
+-set( CMAKE_BUILD_TYPE           Release )
+-set( CMAKE_C_FLAGS              "-O3" )
+ 
+ # Version.
+ file( READ                      "VERSION" mpw_version )
diff --git a/srcpkgs/masterpassword-cli/template b/srcpkgs/masterpassword-cli/template
index ee2b8d41ae4b..8732491bfc55 100644
--- a/srcpkgs/masterpassword-cli/template
+++ b/srcpkgs/masterpassword-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'masterpassword-cli'
 pkgname=masterpassword-cli
 version=2.6
-revision=5
+revision=6
 wrksrc=MasterPassword-${version}-cli-3
 build_wrksrc=platform-independent/cli-c
 build_style=cmake
@@ -10,18 +10,26 @@ hostmakedepends="libsodium-devel json-c-devel ncurses-devel"
 makedepends="libsodium-devel json-c-devel ncurses-devel"
 short_desc="CLI version of Master Password"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, Apache-1.0, ISC, BSD-4-Clause"
 homepage="https://ssl.masterpasswordapp.com/"
 distfiles="https://github.com/Lyndir/MasterPassword/archive/${version}-cli-3.tar.gz"
 checksum=35dc64bc74c04b534824c21da96e4a10fc7978da376fcc036d7ec08fd800ab7a
+# Apache-1.0 is incompatible with GPL-3+
+restricted=yes
 
 pre_configure() {
-	sed -i 's|\"-O3\"|\"-fPIC -O3\"|' ${wrksrc}/${build_wrksrc}/CMakeLists.txt
-	echo '2.6-cli-3-0-ga85eff42' > ${wrksrc}/${build_wrksrc}/VERSION
+	echo "${version}-cli" > ${wrksrc}/${build_wrksrc}/VERSION
 }
 
 do_install() {
 	cat mpw.completion.bash | tail -n +3 >> bashcomplib
 	vinstall bashcomplib 644 usr/share/bash-completion/completions mpw
 	vbin ${cmake_builddir}/mpw
+
+	sed -n '5,31p' cli/blf.h >blowfish.4BSD
+	vlicense blowfish.4BSD
+	sed -n '4,17p' cli/bcrypt.h >bcrypt.ISC
+	vlicense bcrypt.ISC
+	head -55 core/base64.c >base64.license
+	vlicense base64.license
 }

From d576164e21b50c8817a9eb436bac774f9e1a88b6 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 29 Mar 2021 09:34:04 +1100
Subject: [PATCH 0124/2024] New package: haskell-language-server-1.0.0

---
 srcpkgs/haskell-language-server/template | 25 ++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/haskell-language-server/template

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
new file mode 100644
index 000000000000..438c760f0a1f
--- /dev/null
+++ b/srcpkgs/haskell-language-server/template
@@ -0,0 +1,25 @@
+# Template file for 'haskell-language-server'
+pkgname=haskell-language-server
+version=1.0.0
+revision=1
+# GHC only panics on i686
+# https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
+archs="~i686"
+build_style="haskell-stack"
+make_build_args="--stack-yaml stack-8.8.4.yaml"
+makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
+short_desc="Integration of ghcide and haskell-ide-engine"
+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"
+nopie_files="
+ /usr/bin/haskell-language-server
+ /usr/bin/haskell-language-server-wrapper
+ /usr/bin/ghcide-bench
+ /usr/bin/ghcide
+ /usr/bin/ghcide-test-preprocessor
+ /usr/bin/test-server
+"
+nocross="Cannot yet cross compile with Haskell"

From 317709cab4b867a993c9d35bc74fdaf387da7e05 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 29 Mar 2021 08:48:53 +0200
Subject: [PATCH 0125/2024] autorunner: update to 1.1.1.

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

diff --git a/srcpkgs/autorunner/template b/srcpkgs/autorunner/template
index 91bb4914adca..55fb18e5e661 100644
--- a/srcpkgs/autorunner/template
+++ b/srcpkgs/autorunner/template
@@ -1,19 +1,19 @@
 # Template file for 'autorunner'
 pkgname=autorunner
-version=1.0.0
+version=1.1.1
 revision=1
 conf_files="/etc/autorunner.config"
 short_desc="Autostart helper for Desktops"
 maintainer="teldra <teldra@rotce.de>"
 license="MIT"
-homepage="https://github.com/cytopia/${pkgname}"
+homepage="https://github.com/cytopia/autorunner"
 distfiles="https://github.com/cytopia/${pkgname}/archive/v${version}.tar.gz"
-checksum=e6542e807b84204978d393bf978222daa284414949627c89c4c535d86e8d6759
+checksum=4f9d31675e0c47ba3dff5601bd1c156ce008cce81dfb5a0558733f6f68d6d930
 
 do_install() {
-	vbin autorunner
+	vbin bin/autorunner
 	vlicense LICENSE.md LICENSE
-	vsconf config
-	vconf config autorunner.config
+	vsconf etc/config
+	vconf etc/config autorunner.config
 	vdoc README.md README
 }

From 6e55f0cc108d9fb441a61b75fa202cf0b97ad024 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 28 Mar 2021 21:14:42 +0300
Subject: [PATCH 0126/2024] font-iosevka: update to 5.1.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 eb1e44c521b8..521d9ab3b5ff 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=5.0.8
+version=5.1.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -12,8 +12,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- dc8f7cb92676949ffd5c46d09d4ee0e73e0538844c2198f3b5fee0216545cc35
- b3565ce3f8e876274c32ef6d776f1b7d60dba99257afb812e2405d140314823b"
+ d5025d8cc1e969fa2364d28f08a82478a839788ceb7d41d10367c25cbf79ca6b
+ 80c1d9ea390414e645efadc9fd6792d8e05be8a983c2add505ae1b62c963ec8b"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 20d4104202fff89f8bf996ec2a61c22e4c11e8f6 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 28 Mar 2021 21:11:15 +0300
Subject: [PATCH 0127/2024] font-sarasa-gothic: update to 0.20.0

---
 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 0917db18c672..01c2a07202d2 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.18.8
+version=0.20.0
 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=647d556644c2d2ec04dd7f51a9fec1d32d6926331a37a37c10b9e2d64d2ed4a7
+checksum=d71a0fc07665a81bd94bbd6d4063f3141f56a78a1dea536886ecb029f34338f0
 
 font_dirs="/usr/share/fonts/TTF"
 

From f90f68c3565fb18e63adb66910ec4203d046a200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 29 Mar 2021 14:23:23 -0300
Subject: [PATCH 0128/2024] ZMusic: update to 1.1.6.

---
 srcpkgs/ZMusic/patches/0001-fix-cross.patch | 28 ---------------------
 srcpkgs/ZMusic/template                     |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/ZMusic/patches/0001-fix-cross.patch

diff --git a/srcpkgs/ZMusic/patches/0001-fix-cross.patch b/srcpkgs/ZMusic/patches/0001-fix-cross.patch
deleted file mode 100644
index ede6c9798334..000000000000
--- a/srcpkgs/ZMusic/patches/0001-fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b430f543c850acfb98751bfcf5343afb397cf049 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Thu, 31 Dec 2020 09:18:14 -0600
-Subject: [PATCH] fix cross
-
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git CMakeLists.txt CMakeLists.txt
-index 5f4cb14..28e622b 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -24,11 +24,6 @@ if( FORCE_CROSSCOMPILE )
- 	set( CMAKE_CROSSCOMPILING TRUE )
- endif()
- 
--if(CMAKE_CROSSCOMPILING)
--	set(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Export file from native build.")
--	include(${IMPORT_EXECUTABLES})
--endif()
--
- 
- # Macro for building libraries without debugging information
- macro( make_release_only )
--- 
-2.30.0
-
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index e2f72d46da24..3eb79a261c03 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -1,6 +1,6 @@
 # Template file for 'ZMusic'
 pkgname=ZMusic
-version=1.1.4
+version=1.1.6
 revision=1
 build_style=cmake
 configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
@@ -13,7 +13,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/coelckers/ZMusic"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=29a18a6a8d0db4978a9d5badbbd612be2337d64ef0d768e944ea70f526eae285
+checksum=2cc4a08c4d213df80743828538631f452e1858c2ea5bb47a616e221492de05c0
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel"

From ba1c8515026552994e95d02d560ee72dceefe96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 29 Mar 2021 14:28:41 -0300
Subject: [PATCH 0129/2024] tree-sitter: update to 0.19.4.

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

diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index 3b29e5fe1628..344ac0e0a66f 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -1,6 +1,6 @@
 # Template file for 'tree-sitter'
 pkgname=tree-sitter
-version=0.19.3
+version=0.19.4
 revision=1
 build_style=cargo
 make_install_args="--path=cli"
@@ -9,7 +9,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://tree-sitter.github.io"
 distfiles="https://github.com/tree-sitter/${pkgname}/archive/v${version}.tar.gz"
-checksum=cb01e1832758efe2fd3456e0a6eb0e5aba0e1e11b652c945db70793c2c4f7c2b
+checksum=98e6b7f77d277235ef43023a8eee37745d1bc315c138481ed1b054cff158e817
 make_check=no # tests require generating fixtures from remote repositories
 
 post_build() {

From c9365a9797bd317276c3b5db12b1b98bec345a9a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 29 Mar 2021 20:10:28 +0200
Subject: [PATCH 0130/2024] perl-PDF-Builder: update to 3.022.

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

diff --git a/srcpkgs/perl-PDF-Builder/template b/srcpkgs/perl-PDF-Builder/template
index cab3a202b2aa..a12cb816cc82 100644
--- a/srcpkgs/perl-PDF-Builder/template
+++ b/srcpkgs/perl-PDF-Builder/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-Builder'
 pkgname=perl-PDF-Builder
-version=3.021
+version=3.022
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/pod/PDF::Builder"
 distfiles="${CPAN_SITE}/PDF/${pkgname/perl-/}-$version.tar.gz"
-checksum=237db2ffb2d1aeaaa710c477ccae31ff70f61b67a3c7eabc2df9eaf68a1682c1
+checksum=482b24690c7185f2e7fbbaf9a482b3d1289e25db800bf48f2959f5129977ca31

From 1c406f9c49dec3b1f54a97ffdd8fbd7aaa73cffc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 29 Mar 2021 20:12:17 +0200
Subject: [PATCH 0131/2024] wine: update to 6.5.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index aacaea751031..516ea5d1b17e 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.4
+version=6.5
 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="1b2d2b453d90d6c2d7124e47faeae50e5c54c25f69bee1d06531843261024c8f
- 849daae53c114e85e5c3d5af13ae6dfd9b9bb46cf64f1c275e683212c5c5942e"
+checksum="0600fd208c06925d6634d29f543bba0a64361c34e9bd7609c2f0e209610ad347
+ 965b96a5058d3b4403bafb46993a959b92a2eb7a896f1070368db795e32aeb10"
 
 build_options="mingw staging"
 build_options_default="mingw"

From a4fdec0ecc79716f76a21c5570bc1fce407535fe Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 29 Mar 2021 16:16:23 +0300
Subject: [PATCH 0132/2024] element-desktop: update to 1.7.24

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 8bbce9c1866e..a83ef4ac93a1 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.23
+version=1.7.24
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="91ca363b9cbb99eee16de4270c03396ac316b42902eef5f01fadabcb864c49ea
- f8e0e7147cbe77f3ece7bb3a419645f3e2e4f6e59905c93a1be5d352655a3f78"
+checksum="b7031155c52985992f4ae920e3a37d6f6f37fe49d70552bcdcb58a59b768d898
+ 57dcb4cd5a4387ef009047b66eaf40be7b7eb202e81dd2e22152c70dcb40e39d"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 8f3beb93c4d9bd97dc704f2bd45c905dd0cb4b72 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 23:26:01 +0100
Subject: [PATCH 0133/2024] New package: AusweisApp:1.22.1

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

diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
new file mode 100644
index 000000000000..2264126b3524
--- /dev/null
+++ b/srcpkgs/AusweisApp2/template
@@ -0,0 +1,15 @@
+# Template file for 'AusweisApp2'
+pkgname=AusweisApp2
+version=1.22.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
+makedepends="qt5-devel qt5-tools-devel  qt5-svg-devel qt5-websockets-devel
+ qt5-declarative-devel  qt5-quickcontrols2-devel openssl-devel pcsclite-devel"
+depends="qt5-declarative qt5-quickcontrols2 qt5-graphicaleffects"
+short_desc="Official authentication app for German ID cards and residence permits"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="EUPL-1.2"
+homepage="https://www.ausweisapp.bund.de/ausweisapp2/"
+distfiles="https://github.com/Governikus/AusweisApp2/archive/refs/tags/${version}.tar.gz"
+checksum=8bae7d4fcb03d1ab247bc7b35e55c5d4dfd98f017c121947652e16c29ae6049d

From 1cdc6978538d91400595e22547f7dc741c1d1830 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:02:17 +0100
Subject: [PATCH 0134/2024] nnn: update to 3.6.

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

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index ba12cad5ee51..704b749716e6 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=3.5
+version=3.6
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=e636d4035499a112a0ad33f1557838132ed2e39d8857c5b219714fe9f64681f3
+checksum=875094caebcc22ecf53b3722d139b127d25e1d5563a954342f32ded8980978b5
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \

From ab52b5ac2b8733e020a0185653d141f688199316 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 29 Mar 2021 01:36:35 +0200
Subject: [PATCH 0135/2024] bird: update to 2.0.8

also patch printf_test so it does not fail on musl
---
 srcpkgs/bird/patches/fix-tests-musl.patch | 25 +++++++++++++++++++++++
 srcpkgs/bird/template                     | 11 ++++------
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/bird/patches/fix-tests-musl.patch

diff --git a/srcpkgs/bird/patches/fix-tests-musl.patch b/srcpkgs/bird/patches/fix-tests-musl.patch
new file mode 100644
index 000000000000..2bac77b009d1
--- /dev/null
+++ b/srcpkgs/bird/patches/fix-tests-musl.patch
@@ -0,0 +1,25 @@
+--- lib/printf_test.c
++++ lib/printf_test.c
+@@ -22,6 +22,7 @@ static int
+ t_simple(void)
+ {
+   char buf[256];
++  const char *errormsg;
+   memset(buf, 0xa5, 256);
+ 
+   BSPRINTF(0, "", buf, "", NULL);
+@@ -32,11 +33,12 @@ t_simple(void)
+   BSPRINTF(1, "@", buf, "@", 64);
+   BSPRINTF(1, "\xff", buf, "%c", 0xff);
+ 
+-  errno = 5;
+-  BSPRINTF(18, "Input/output error", buf, "%m");
++  errormsg = strerror(EIO);
++  errno = EIO;
++  BSPRINTF(strlen(errormsg), errormsg, buf, "%m");
+   errno = 0;
+ 
+-  BSPRINTF(18, "Input/output error", buf, "%M", 5);
++  BSPRINTF(strlen(errormsg), errormsg, buf, "%M", EIO);
+ 
+   BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg");
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index 1b6dd7be22b8..bc40598b0360 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,7 +1,8 @@
 # Template file for 'bird'
 pkgname=bird
-version=2.0.7
-revision=2
+version=2.0.8
+revision=1
+wrksrc=bird-v$version
 build_style=gnu-configure
 hostmakedepends="flex autoconf"
 makedepends="ncurses-devel readline-devel libssh-devel"
@@ -10,17 +11,13 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://bird.network.cz"
 distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/v${version}/bird-v${version}.tar.gz"
-checksum=d0c6aeaaef3217d6210261a49751fc662838b55fec92f576e20938917dbf89ab
+checksum=4d0eeea762dcd4422e1e276e2ed123cfed630cf1cce017b50463d79fcf2fff0c
 
 conf_files="/etc/bird.conf"
 system_accounts="_bird"
 
 CFLAGS="-fcommon"
 
-post_extract() {
-	mv -v ${wrksrc/-/-v} $wrksrc
-}
-
 pre_configure() {
 	autoreconf
 }

From ea939c0e1d9d432ffdc7bcb992001538d40d2af6 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, 30 Mar 2021 07:26:36 +0700
Subject: [PATCH 0136/2024] uim: use system libgcroots

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

diff --git a/srcpkgs/uim/template b/srcpkgs/uim/template
index aeb9aff5e913..12df0eddb067 100644
--- a/srcpkgs/uim/template
+++ b/srcpkgs/uim/template
@@ -1,10 +1,11 @@
 # Template file for 'uim'
 pkgname=uim
 version=1.8.8
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--enable-pref --enable-fep --with-gtk2 --with-gtk3
+ --with-libgcroots=installed
  --with-qt5 --with-qt5-immodule --with-x --with-anthy-utf8 --with-skk"
 hostmakedepends="pkg-config intltool qt5-host-tools qt5-qmake automake
  libtool gettext-devel"

From 6821844238deaa1aa6c06f87e214040a0a68563a Mon Sep 17 00:00:00 2001
From: Liam <liambabe96@gmail.com>
Date: Mon, 29 Mar 2021 20:42:23 +1000
Subject: [PATCH 0137/2024] spotify: update to 1.1.55

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

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index d73147bf6b0f..e6e75f86daa6 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.42
-revision=3
-_ver="${version}.622.gbd112320-37_amd64"
+version=1.1.55
+revision=1
+_ver="${version}.498.gf9a83c60_amd64"
 _filename="spotify-client_${_ver}.deb"
 archs="x86_64"
 create_wrksrc=yes
@@ -14,7 +14,7 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
 distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/${_filename}"
-checksum=101a3699197659b8bc60a4fd8b579e63cc494e7abd089c45306559329af4a868
+checksum=78b2364f050c2b02b05784710344e70109b288a2661f92de29f373a718e2ac24
 _license_checksum=3c073aa5bd7ffaba3df5283cdd2d3b36a415bd824234693844548fc3e16027a5
 repository=nonfree
 restricted=yes
@@ -36,12 +36,6 @@ do_build() {
 	bsdtar -xf data.tar.gz
 }
 
-_linklib() {
-	local LIB
-	LIB="$(find /usr/lib -name "${1}.so*" | sort | tail -1)"
-	ln -sf "${LIB}" "${DESTDIR}/usr/libexec/spotify/${1}.so.${2}"
-}
-
 do_install() {
 	vbin "${FILESDIR}/spotify"
 
@@ -65,8 +59,6 @@ do_install() {
 		"${DESTDIR}/usr/share/applications/spotify.desktop"
 
 	# provide dynamic libraries
-	_linklib libssl 1.0.0
-	_linklib libcrypto 1.0.0
 	ln -s /usr/lib/libcurl.so.4 ${DESTDIR}/usr/libexec/spotify/libcurl-gnutls.so.4
 
 	vlicense EULA

From 33cc7e32f57d0c6ffef6cdd97e929ea7e02ec66f Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 30 Mar 2021 01:30:26 +0200
Subject: [PATCH 0138/2024] man-pages: update to 5.11.

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

diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index a61249ca0510..f9f7e9a144a7 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,13 +1,13 @@
 # Template file for 'man-pages'
 pkgname=man-pages
-version=5.10
+version=5.11
 revision=1
 short_desc="Linux Documentation Project (LDP) manual pages"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://man7.org/linux/man-pages/index.html"
 distfiles="${KERNEL_SITE}/docs/man-pages/${pkgname}-${version}.tar.xz"
-checksum=75102535ba119f2f223f674d84e1dcdaebf0a5ffd639b3c2e6cb0a0e34768762
+checksum=3eda5dce5184599ec37dae3494cf964c550362e9a41fb724792da610bdb13caa
 
 do_install() {
 	make all prefix=${DESTDIR}/usr

From 8c18446440f395dc917813e4423e4213d12d5f00 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:06:32 +0100
Subject: [PATCH 0139/2024] cryptsetup: update to 2.3.5.

Closes: #29608 [via git-merge-pr]
---
 srcpkgs/cryptsetup/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index a852d5ce618b..22b5840bd512 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,7 +1,7 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
-version=2.3.4
-revision=2
+version=2.3.5
+revision=1
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
@@ -16,7 +16,8 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.com/cryptsetup/cryptsetup"
 changelog="https://gitlab.com/cryptsetup/cryptsetup/raw/master/docs/v${version}-ReleaseNotes"
 distfiles="${KERNEL_SITE}/utils/cryptsetup/v${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9d16eebb96b53b514778e813019b8dd15fea9fec5aafde9fae5febf59df83773
+checksum=ced9946f444d132536daf92fc8aca4277638a3c2d96e20540b2bae4d36fd70c1
+make_check=extended
 subpackages="libcryptsetup cryptsetup-devel"
 
 build_options="pwquality"

From fb8845fe2fe2489fdaa00595a60123fda921e403 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Mon, 29 Mar 2021 19:23:02 -0400
Subject: [PATCH 0140/2024] chezmoi: update to 2.0.5.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 8d23b11dd9a0..3e16e9951cf7 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.0.4
+version=2.0.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi"
@@ -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=5d2f097a0d8ce22489dc97cadaf85610a71273aaa150f59ecd10e5acce2a7fdb
+checksum=36f52b8a519f43a64a3317920259eb43b183ad103302c6a3c8056ee3416fd4b4
 
 post_install() {
 	vlicense LICENSE

From bad51a48e0f32467f40bd20f5fd080f54bf6981b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 29 Mar 2021 20:49:06 -0500
Subject: [PATCH 0141/2024] scc: update to 3.0.0.

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

diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 01a9ba2e4c17..77160485cc6d 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,6 +1,6 @@
 # Template file for 'scc'
 pkgname=scc
-version=2.13.0
+version=3.0.0
 revision=1
 build_style=go
 go_import_path="github.com/boyter/scc"
@@ -9,7 +9,7 @@ maintainer="Sami Pitkänen <bilebucket@airmail.cc>"
 license="MIT"
 homepage="https://github.com/boyter/scc"
 distfiles="https://github.com/boyter/scc/archive/v${version}.tar.gz"
-checksum=11e2e44ef25ef848de1b380c94cb096ed77d3d590466c99c9f1b5c2dc99609c2
+checksum=01b903e27add5180f5000b649ce6e5088fa2112e080bfca1d61b1832a84a0645
 
 post_install() {
 	vlicense LICENSE

From 7dcea68bcc500f55207851b428707637dae3b069 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 29 Mar 2021 17:19:22 -0500
Subject: [PATCH 0142/2024] perl-Alien-Build: update to 2.38.

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

diff --git a/srcpkgs/perl-Alien-Build/template b/srcpkgs/perl-Alien-Build/template
index 61fb12791a10..d80a047a1a31 100644
--- a/srcpkgs/perl-Alien-Build/template
+++ b/srcpkgs/perl-Alien-Build/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-Alien-Build'
 pkgname=perl-Alien-Build
-version=2.23
-revision=2
+version=2.38
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-PkgConfig perl-File-Which"
 depends="perl-Capture-Tiny perl-FFI-CheckLib perl-Path-Tiny
  perl-File-Which perl-File-chdir perl-Archive-Zip"
-checkdepends="${depends} perl-Test-Simple perl-Test2-Suite"
+checkdepends="${depends} perl-Test2-Suite"
 short_desc="Build external dependencies for use in CPAN"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/pod/Alien::Build"
 distfiles="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-${version}.tar.gz"
-checksum=a6a37a01c78b39da802ca53061e1273a15d74f9d3daf523d72d3518d5015a1df
+checksum=6bbd4116d1a08f95df669fcba16acd6a7e94329843abc8cb7c4b038d1778bded

From 7fbcb9b8f798a0536b3b54fff0344dc855bcbcb7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 29 Mar 2021 17:13:31 -0500
Subject: [PATCH 0143/2024] perl-Moo: update to 2.005004.

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

diff --git a/srcpkgs/perl-Moo/template b/srcpkgs/perl-Moo/template
index daeccff1bfbb..8c5292f03f57 100644
--- a/srcpkgs/perl-Moo/template
+++ b/srcpkgs/perl-Moo/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Moo'
 pkgname=perl-Moo
-version=2.005003
+version=2.005004
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -15,4 +15,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Moo"
 distfiles="https://cpan.org/authors/id/H/HA/HAARG/Moo-${version}.tar.gz"
-checksum=bcb5ff4a4f806647ce16e1cbf85bdc0ab5d1e7ae3dc224ab6bcc774bc2e82b43
+checksum=e3030b80bd554a66f6b3c27fd53b1b5909d12af05c4c11ece9a58f8d1e478928

From 41852b978348ee6f2266a22c38ab678e3ee37acc Mon Sep 17 00:00:00 2001
From: Adam Gausmann <agausmann@fastmail.com>
Date: Mon, 29 Mar 2021 16:04:23 -0500
Subject: [PATCH 0144/2024] rpi-imager: update to 1.6.1.

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

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 8a5cfed44136..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum="811f9c261f82f75eefb9129570c47ff6653c1e9af08d9ed0b877261b4d184685"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk

From feba5817b7454dcade414fc2979ecc25db8c65be Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:35:18 -0700
Subject: [PATCH 0145/2024] dmd-bootstrap: fix template

Also changes here-doc style to satisfy xlint.
---
 srcpkgs/dmd-bootstrap/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 2de0cf45fd9e..029b0024faea 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -1,17 +1,16 @@
 # Template file for 'dmd-bootstrap'
 pkgname=dmd-bootstrap
 version=2.069.20180305
-revision=2
+revision=3
 _gitrev_dmd=75266348c8a2368945a339ab86d7c8960a9bfc08
 _gitrev_druntime=33ae38cef41564b12864470afaf8430eb7334d3b
 _gitrev_phobos=30ac23a0889dd183221ce531a057171dd45296c4
+archs="x86_64* i686*"
 create_wrksrc=yes
 build_style=gnu-makefile
-provides="d-compiler-${version}_${revision}"
-archs="x86_64* i686*"
 short_desc="DMD Compiler (last C++ version for bootstrap)"
 maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
-license="custom"
+license="BSL-1.0"
 homepage="https://dlang.org/"
 distfiles="
  https://github.com/dlang/dmd/archive/${_gitrev_dmd}.tar.gz>dmd-${version}.tar.gz
@@ -21,6 +20,7 @@ checksum="
  015ad5ce9d60bc183b9b40ae649eafeced93cb2a211400d9280464b22acdb129
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
+provides="d-compiler-${version}_${revision}"
 
 post_extract() {
 	rm -rf dmd druntime phobos
@@ -56,10 +56,10 @@ do_install() {
 	vbin dmd
 
 	vmkdir etc
-	cat > $DESTDIR/etc/dmd.conf <<EOF
-[Environment]
-DFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib${XBPS_TARGET_WRODSIZE} -L--export-dynamic
-EOF
+	cat > $DESTDIR/etc/dmd.conf <<- EOF
+	[Environment]
+	DFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib${XBPS_TARGET_WRODSIZE} -L--export-dynamic
+	EOF
 
 	vlicense backendlicense.txt
 	vlicense boostlicense.txt

From 9d6250c6ff5945226d67f782fe2034059895e4b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 30 Mar 2021 00:03:23 -0400
Subject: [PATCH 0146/2024] zfsbootmenu: update to 1.9.0.

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

diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 16e0d4f60b63..53b31ed4fd76 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,7 +1,7 @@
 # Template file for 'zfsbootmenu'
 pkgname=zfsbootmenu
-version=1.8.1
-revision=2
+version=1.9.0
+revision=1
 build_style=gnu-makefile
 conf_files="/etc/zfsbootmenu/config.yaml"
 depends="dracut zfs kexec-tools bash pigz mbuffer ncurses
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/zbm-dev/zfsbootmenu"
 changelog="https://raw.githubusercontent.com/zbm-dev/zfsbootmenu/master/CHANGELOG.md"
 distfiles="https://github.com/zbm-dev/zfsbootmenu/archive/v${version}.tar.gz"
-checksum=b86e34448ccb43e4c4f2e6cad51886bb97252475318b79e27c963dc42f64e787
+checksum=f64b50bd4c88e74bf9fcbde305fe917af0f383da04b4433544b154b8eee352b6
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)

From 71e51568e1ab647ee197eb67e047875d642a2ce3 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Tue, 30 Mar 2021 12:31:24 +0800
Subject: [PATCH 0147/2024] goatcounter: update to 2.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This also correctly sets the version so that "goatcounter version" shows the
expected result instead of just "dev", and adds a dependency on tzdata.

I've also taken the liberty of setting myself as the maintainer; I'm the
upstream author and a Void user as well. I accidentally discovered there's a
Void package last week when doing some license analysis on void-packages 😅
The current 1.2.0 is pretty outdated, so I don't expect @anjandev will mind?

Fixes: #22087
---
 srcpkgs/goatcounter/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index ec37becd1d41..01090e13c77d 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,13 +1,15 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
-version=1.2.0
+version=2.0.0
 revision=1
 build_style=go
 go_import_path=zgo.at/goatcounter
 go_package="${go_import_path}/cmd/goatcounter"
+go_ldflags="-X zgo.at/goatcounter.Version=${version}"
+depends="tzdata"
 short_desc="Easy web analytics without tracking of personal data"
-maintainer="Anjandev Momi <anjan@momi.ca>"
+maintainer="Martin Tournoij <martin@arp242.net>"
 license="EUPL-1.2"
 homepage="https://www.goatcounter.com/"
 distfiles="https://github.com/zgoat/goatcounter/archive/v${version}.tar.gz"
-checksum=505f8c5848bb368e18c0a041fcbeb87f540813a7455d9a67cdce5a5f25d799e7
+checksum=bca27f65a302482ae018e9d7c5449c4e91aec11a4eea2f62cfe2ed8743a9b241

From 7d5f5d46d2bf40f6b76c3ffba6a9cb9e90976cbd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 Mar 2021 10:43:40 +0200
Subject: [PATCH 0148/2024] sbcl: update to 2.1.3.

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

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 67b3e5f34a5e..058bff20ccb1 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.2
+version=2.1.3
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=b7710550939855ed49598c4a014483ed120b6991658a2a3b6afa47713dce4c0b
+checksum=a90d4a4150c5ec1e13f07aa67dff2bde3b3c8344eaf81f4e9a519c8ab41adac0
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 5312b826a65b07df1d59370bd52a753269c8d703b4f482e6a8dbb7986599be46"
+	checksum+=" e202b27f98ab5e74e75482b1cd439d43ec87845cbb96ba07471117b7c6b8eafb"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From e8e139a7c350215de410bfc12814f1182c49f67e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 Mar 2021 10:45:04 +0200
Subject: [PATCH 0149/2024] byacc: update to 20210328.

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

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 327151602dd0..3f45094f3866 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210109
+version=20210328
 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=9e7d7768587141e7784492615dfefc70a8e00410043b63901efedc1b50c19b97
+checksum=8b8f258eb22a4eae994ee374a712dd08e023cde1c39b373e8db8ba7806c50585
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 27af4f85e557ddf50f06731857a2c24989e1ca84 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 Mar 2021 10:45:07 +0200
Subject: [PATCH 0150/2024] re2c: update to 2.1.1.

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

diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index c253251157b0..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,6 +1,6 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=8cba0d95c246c670de8f97f57def83a9c0f2113eaa6f7e4867a941f48f633540
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8

From a885b4f2be50fdd06ed33655d19a62ab7f62d26e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 Mar 2021 11:24:59 +0200
Subject: [PATCH 0151/2024] libXaw: update to 1.0.14.

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

diff --git a/srcpkgs/libXaw/template b/srcpkgs/libXaw/template
index 3411b75de4ea..dd745e482e28 100644
--- a/srcpkgs/libXaw/template
+++ b/srcpkgs/libXaw/template
@@ -1,17 +1,17 @@
 # Template file for 'libXaw'
 pkgname=libXaw
-version=1.0.13
-revision=2
+version=1.0.14
+revision=1
 build_style=gnu-configure
 configure_args="--without-xmlto"
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXt-devel libXmu-devel libXpm-devel"
 short_desc="X Athena Widgets Library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd
+checksum=76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e
 
 post_install() {
 	vlicense COPYING

From c6583111a81c92ea167bfb27e22a8a8d54790efb 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, 30 Mar 2021 19:40:14 +0700
Subject: [PATCH 0152/2024] xorriso: ignore development version

---
 srcpkgs/xorriso/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/xorriso/update

diff --git a/srcpkgs/xorriso/update b/srcpkgs/xorriso/update
new file mode 100644
index 000000000000..d0cdce535c07
--- /dev/null
+++ b/srcpkgs/xorriso/update
@@ -0,0 +1 @@
+pattern="xorriso-\K\d+\.\d+\.\d*[02468](\.pl\d+)?(?=.tar)"

From 1aa513995a669fcedf3bf58e605943a185e2d116 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Tue, 30 Mar 2021 21:53:25 +0800
Subject: [PATCH 0153/2024] uni: update to 2.1.0

https://github.com/arp242/uni/releases/tag/v2.1.0
---
 srcpkgs/uni/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 1d7bd119b5f8..c2cae64515e0 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,6 +1,6 @@
 # Template file for 'uni'
 pkgname=uni
-version=2.0.0
+version=2.1.0
 revision=1
 build_style=go
 go_import_path=arp242.net/uni
@@ -9,7 +9,7 @@ maintainer="klardotsh <josh@klar.sh>"
 license="MIT"
 homepage="https://github.com/arp242/uni"
 distfiles="https://github.com/arp242/uni/archive/v${version}.tar.gz"
-checksum=744e1d49b9cc8e336e260e0e922b28bb60f8fdaf347e656e964b5f4353c5162a
+checksum=79574395d83f628b0b325127b2dcea9b3e91dd6510dafd036679fae8998bcf6e
 
 post_install() {
 	vlicense LICENSE

From 783a29fb67946316154d787167c81f6154fd9bf5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 Mar 2021 16:10:25 +0200
Subject: [PATCH 0154/2024] linux5.10: update to 5.10.27.

---
 srcpkgs/linux5.10/files/x86_64-dotconfig | 3 ++-
 srcpkgs/linux5.10/template               | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 33b0149b6164..619dc7455c81 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.26 Kernel Configuration
+# Linux/x86_64 5.10.27 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7741,6 +7741,7 @@ CONFIG_HYPERV_BALLOON=m
 #
 CONFIG_XEN_BALLOON=y
 # CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_BACKEND=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 60c5f961db6c..065727898423 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.26
+version=5.10.27
 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=fc532833f1ac167f363f1b9de85db39d2d635ab516f66dc381bdd70804601482
+checksum=d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
 python_version=3
 patch_args="-Np1"
 

From bb32aaf57a70d4139e5bb40778f8849836df3dca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 29 Mar 2021 15:26:16 +0200
Subject: [PATCH 0155/2024] openradtool: update to 0.12.4.

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

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 894eb63e8b6f..3256322015e3 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.2
+version=0.12.4
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=829368a87d28af95bb12ad986f1ae8055d7a657a59e7e8418acddaf7a0ad5d59
+checksum=e2699f2a4eda1bd5e2ace625239acdcb5e40e86e357610331761ba7439d8f624
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From c67dabe10a610d0fd3a9c42da7dbf88c5aacdae3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 30 Mar 2021 15:57:46 +0200
Subject: [PATCH 0156/2024] monit: update to 5.28.0.

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

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 1b0766e194ab..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.27.2
-revision=2
+version=5.28.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -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=d8809c78d5dc1ed7a7ba32a5a55c5114855132cc4da4805f8d3aaf8cf46eaa4c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap

From 336867d33062257ef88bd351a5b1a52c35561cbb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 30 Mar 2021 16:17:52 +0200
Subject: [PATCH 0157/2024] syncthing: update to 1.14.0.

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

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 8bfb1673213b..23cddc403f32 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.13.1
+version=1.14.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -18,7 +18,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f4632a062f75d01629e625ccef9625313f5d371c5f9bee744b0b811d47b92e25
+checksum=ab34f328fdca5a1a334af844787e72e6a80988830a5223d82a915efe038433ec
 
 pre_build() {
 	GOARCH= go generate \

From 423f29dfd348c81ab61c33e8907219e248b2b9fc Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 30 Mar 2021 01:31:50 +0200
Subject: [PATCH 0158/2024] bison: update to 3.7.6.

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

diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index 56f380246b15..10fa2159cd4a 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -1,6 +1,6 @@
 # Template file for 'bison'
 pkgname=bison
-version=3.7.4
+version=3.7.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="help2man perl m4"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bison/bison.html"
 distfiles="${GNU_SITE}/bison/bison-${version}.tar.xz"
-checksum=a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010
+checksum=67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf
 alternatives="
  yacc:yacc:/usr/bin/bison-yacc
  yacc:yacc.1:/usr/share/man/man1/bison-yacc.1"

From 17bbe77fb96a23da16a8bd40108a8ef835a952a9 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 30 Mar 2021 12:02:03 +0200
Subject: [PATCH 0159/2024] cronie: update to 1.5.7.

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

diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 2e563cf02b40..6c1c7adb523d 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -1,6 +1,6 @@
 # Template file for 'cronie'
 pkgname=cronie
-version=1.5.6
+version=1.5.7
 revision=1
 build_style=gnu-configure
 configure_args="--with-inotify --without-selinux --with-pam
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/cronie-crond/cronie"
 changelog="https://raw.githubusercontent.com/cronie-crond/cronie/master/NEWS"
 distfiles="${homepage}/releases/download/cronie-${version}/cronie-${version}.tar.gz"
-checksum=f7ad9da2869c2dc8d9a54addfab969a9753eea8fd65e6d27dd935276eb66829d
+checksum=538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3
 make_dirs="
 	/etc/cron.d 0755 root root
 	/etc/cron.hourly 0755 root root

From b343d6252bae6941de5f62e41c7f42e7836dd7b2 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Sat, 13 Feb 2021 18:58:56 +0000
Subject: [PATCH 0160/2024] plan9port: update to 20210324

---
 srcpkgs/plan9port/template | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template
index 4b4c7efc1aa4..a39c1ee1c2cf 100644
--- a/srcpkgs/plan9port/template
+++ b/srcpkgs/plan9port/template
@@ -1,23 +1,20 @@
 # Template file for 'plan9port'
 pkgname=plan9port
-version=20200927
-revision=2
-_githash=291f7411783bf6871b253f3b15ce691eea7a257e
+version=20210324
+revision=1
+_githash=88a87fadae6629932d9c160f53ad5d79775f8f94
 wrksrc="${pkgname}-${_githash}"
 hostmakedepends="perl which"
 makedepends="libX11-devel libXt-devel libXext-devel freetype-devel fontconfig-devel"
 short_desc="Port of many Plan 9 programs to Unix-like operating systems"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="LPL-1.02"
+license="MIT, bzip2-1.0.6, Public Domain, custom:Bigelow & Holmes,
+ custom:Bigelow & Holmes Inc and URW++ GmbH, custom:Bitstream Vera Fonts"
 homepage="https://9fans.github.io/plan9port/"
 distfiles="https://github.com/9fans/plan9port/archive/${_githash}.tar.gz"
-checksum=4db90ed7859066d26a424ebde38b318bb6030ad9209cdbfb4f5fb32fb486a659
+checksum=d4b873a094035024fe54282a7fdd652255b73b51c4fd78ae7701746d1e3e8f38
 nocross=yes
 
-if [[ $XBPS_TARGET_MACHINE == *-musl ]]; then
-	makedepends+=" libucontext-devel"
-fi
-
 CFLAGS="-fcommon"
 
 post_extract() {
@@ -32,23 +29,26 @@ post_extract() {
 	sed -i "s,/usr/local/plan9,/usr/lib/plan9,g" \
 		 $(grep -lr /usr/local/plan9)
 }
+
 do_build() {
 	CFLAGS+=' -D_DEFAULT_SOURCE'
 	echo "CFLAGS='$CFLAGS'" >LOCAL.config
 	echo "LDFLAGS='$LDFLAGS'" >>LOCAL.config
 	vsed -e 's/-O2/$CFLAGS/' -i bin/9c
-	if [[ $XBPS_TARGET_MACHINE == *-musl ]]; then
-		# add libucontext to extralibs under linux
-		vsed -e '/^\textralibs=.*-lpthread"$/s/"$/ -lucontext"/' -i bin/9l
-	fi
 
-	./INSTALL
+	NPROC=$XBPS_MAKEJOBS ./INSTALL
 }
+
 do_install() {
 	xargs -a lib/moveplan9.files -d'\n' sed -i "s#$wrksrc#/usr/lib/plan9#"
 
 	vinstall $FILESDIR/plan9.sh 644 etc/profile.d
 	vlicense LICENSE
+	vlicense src/cmd/bzip2/LICENSE LICENSE.bzip2
+	vlicense postscript/font/dejavu/LICENSE.dejavu
+	vlicense postscript/font/luxi/COPYRIGHT.BH
+	sed '1d' font/luc/NOTICE > NOTICE.BH
+	vlicense NOTICE.BH
 
 	vmkdir usr/lib
 	cp -a $wrksrc $DESTDIR/usr/lib/plan9

From 6f0a3d0494d0d84593a351fea14df58b17b923d4 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 28 Mar 2021 22:52:38 +0200
Subject: [PATCH 0161/2024] catgirl: update to 1.7.

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

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 3814d7595355..7c3199015c5c 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,7 +1,7 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.6
-revision=3
+version=1.7
+revision=1
 build_style=configure
 configure_args="--prefix=/usr"
 make_build_target="all"
@@ -12,4 +12,4 @@ maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
 distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=3b32ee3b57cab5fa29b0a6cb9d21a4a5e5f41efd4a698cb9df15e316bf000f6a
+checksum=dec85275eab897a6390c4259115307027829eaf8e790f8f3a4ba5ca78d3b5ffd

From 095ef35d479c697e652d21e8aecc75467df886b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 Mar 2021 16:58:50 +0200
Subject: [PATCH 0162/2024] xfsprogs: update to 5.11.0.

Closes #29615.
---
 srcpkgs/xfsprogs/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 5fe5ec020a76..8d1c1e7004bc 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=5.10.0
+version=5.11.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-editline=yes --enable-lib64=no"
@@ -11,7 +11,11 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://xfs.org/index.php/Main_Page"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
-checksum=e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9
+checksum=0e9c390fcdbb8a79e1b8f5e6e25fd529fc9f9c2ef8f2d5e647b3556b82d1b353
+
+post_extract() {
+	sed -i '1i#include <signal.h>' include/linux.h
+}
 
 do_install() {
 	make install install-dev DIST_ROOT=${DESTDIR} \

From fec200742e3b0e84b9feb940c978155914978f11 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 30 Mar 2021 16:35:43 +0200
Subject: [PATCH 0163/2024] teams-bin: update to 1.4.00.7556.

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

diff --git a/srcpkgs/teams-bin/template b/srcpkgs/teams-bin/template
index bd40abe82386..7a1e4d5383e9 100644
--- a/srcpkgs/teams-bin/template
+++ b/srcpkgs/teams-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'teams-bin'
 pkgname=teams-bin
-version=1.4.00.4855
+version=1.4.00.7556
 revision=1
 archs="x86_64"
 short_desc="Official Microsoft Teams client"
@@ -8,7 +8,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:Proprietary"
 homepage="https://teams.microsoft.com/downloads"
 distfiles="https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"
-checksum=a91dbdf646f12659fdf8d08831aa06ab1bf4cc6fb981841c36a350f29bd714bc
+checksum=ebd01ef8c63f2e63f665994e20c159c1692d9b3e1a682df929b63d00bb1c5379
 
 repository=nonfree
 restricted=yes

From 2435a8d8d439aba02a2fd21956f885fcdffa4831 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 Mar 2021 17:17:13 +0200
Subject: [PATCH 0164/2024] liburing: update to 2.0.

Disable building tests and examples.

Closes #29622.
---
 common/shlibs                                 |  2 +-
 ...s-disable-compilation-of-ucontext-cp.patch | 28 -------------------
 srcpkgs/liburing/template                     |  5 ++--
 3 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/liburing/patches/0001-liburing-examples-disable-compilation-of-ucontext-cp.patch

diff --git a/common/shlibs b/common/shlibs
index 3a2c8d27b3a0..23a2a60a01d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
-liburing.so.1 liburing-0.7_1
+liburing.so.2 liburing-2.0_1
 libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
diff --git a/srcpkgs/liburing/patches/0001-liburing-examples-disable-compilation-of-ucontext-cp.patch b/srcpkgs/liburing/patches/0001-liburing-examples-disable-compilation-of-ucontext-cp.patch
deleted file mode 100644
index 2faa3d6b1f26..000000000000
--- a/srcpkgs/liburing/patches/0001-liburing-examples-disable-compilation-of-ucontext-cp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 74782fe227819eeadc9768bd9ffb10ee81ef60e1 Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sat, 26 Oct 2019 12:45:46 +0200
-Subject: [PATCH] liburing/examples: disable compilation of ucontext-cp example
-
-the code leverages ucontext.h functionality which is not implemented in
-musl libc and thus fails compilation. the example code is anyway not
-part of the final package, so just remove it from compilation.
----
- examples/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git examples/Makefile examples/Makefile
-index 6fe3ac3..61a2b56 100644
---- examples/Makefile
-+++ examples/Makefile
-@@ -4,7 +4,7 @@ override CFLAGS += -Wall -D_GNU_SOURCE -L../src/ -I../src/include/
- 
- include ../Makefile.quiet
- 
--all_targets += io_uring-test io_uring-cp link-cp ucontext-cp
-+all_targets += io_uring-test io_uring-cp link-cp
- 
- all: $(all_targets)
- 
--- 
-2.23.0
-
diff --git a/srcpkgs/liburing/template b/srcpkgs/liburing/template
index 44711b2988c7..3dc0db28a89b 100644
--- a/srcpkgs/liburing/template
+++ b/srcpkgs/liburing/template
@@ -1,15 +1,16 @@
 # Template file for 'liburing'
 pkgname=liburing
-version=0.7
+version=2.0
 revision=1
 build_style=configure
 configure_args="--mandir=/usr/share/man"
+make_build_args="-C src"
 short_desc="Linux-native io_uring I/O access library"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-only"
 homepage="http://git.kernel.dk/cgit/liburing"
 distfiles="${homepage}/snapshot/${pkgname}-${version}.tar.gz"
-checksum=05d0cf8493d573c76b11abfcf34aabc7153affebe17ff95f9ae88b0de062a59d
+checksum=fcc29d6f00d0d1eca3d83d40cc7e9a2773ef98d4edbfe536b7317d65992f75f8
 
 liburing-devel_package() {
 	short_desc+=" - development files"

From 23fa48ae2456e3803d7bfdaeffcc15d0066a3273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 30 Mar 2021 13:48:34 -0300
Subject: [PATCH 0165/2024] linux-firmware: move cypress firmware to
 linux-firmware-broadcom.

Many people, including those using our linux package, will only have
linux-firmware-network installed, not linux-firmware; therefore, many
symlinks from the linux-firmware-broadcom package (pulled in by
linux-firmware-network) would be broken, because the cypress files were
in linux-firmware.

Reported by Stas over email.
---
 srcpkgs/linux-firmware/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 6d4a5ffbb45c..d41e016a1187 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20210315
-revision=1
+revision=2
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -45,6 +45,9 @@ linux-firmware-broadcom_package() {
 	pkg_install() {
 		vmove usr/lib/firmware/brcm
 		vmove usr/share/licenses/linux-firmware/LICENCE.broadcom_bcm43xx
+		# firmware/brcm contains multiple symlinks to ../cypress/
+		vmove usr/lib/firmware/cypress
+		vmove usr/share/licenses/linux-firmware/LICENCE.cypress
 	}
 }
 

From 03069bc3a43bdb3e56d47141376694ac530f447d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 29 Mar 2021 14:55:23 -0300
Subject: [PATCH 0166/2024] fwupd: update to 1.5.8.

---
 srcpkgs/fwupd/patches/musl.patch | 44 ++++++++++++++++++++++++++++++++
 srcpkgs/fwupd/template           |  5 ++--
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
new file mode 100644
index 000000000000..fd7dfb19308b
--- /dev/null
+++ b/srcpkgs/fwupd/patches/musl.patch
@@ -0,0 +1,44 @@
+Upstream: https://github.com/fwupd/fwupd/pull/3080
+
+diff --git a/meson.build b/meson.build
+index 86e70573..e870f7b6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -309,6 +309,12 @@ endif
+ if cc.has_header('fnmatch.h')
+   conf.set('HAVE_FNMATCH_H', '1')
+ endif
++if cc.has_header('malloc.h')
++  conf.set('HAVE_MALLOC_H', '1')
++  if cc.has_function('malloc_trim', prefix: '#include <malloc.h>')
++	 conf.set('HAVE_MALLOC_TRIM', '1')
++  endif
++endif
+ if cc.has_header('cpuid.h') and cc.has_header_symbol('cpuid.h', '__get_cpuid_count') and (host_cpu == 'x86' or host_cpu == 'x86_64')
+   conf.set('HAVE_CPUID_H', '1')
+ else
+diff --git a/src/fu-main.c b/src/fu-main.c
+index b7afde98..5f5de334 100644
+--- a/src/fu-main.c
++++ b/src/fu-main.c
+@@ -14,7 +14,9 @@
+ #include <glib/gi18n.h>
+ #include <glib-unix.h>
+ #include <locale.h>
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#endif
+ #ifdef HAVE_POLKIT
+ #include <polkit/polkit.h>
+ #endif
+@@ -2037,8 +2039,10 @@ main (int argc, char *argv[])
+ 	else if (timed_exit)
+ 		g_timeout_add_seconds (5, fu_main_timed_exit_cb, priv->loop);
+ 
++#ifdef HAVE_MALLOC_TRIM
+ 	/* drop heap except one page */
+ 	malloc_trim (4096);
++#endif
+ 
+ 	/* wait */
+ 	g_message ("Daemon ready for requests (locale %s)", g_getenv ("LANG"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index a2b66a212af4..b0828273d2f0 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.5.5
+version=1.5.8
 revision=1
 build_style=meson
 build_helper="gir"
@@ -27,8 +27,9 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/fwupd"
 distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz"
-checksum=1a6d5026ae37708718b7c0bb277050c96934acb636605f1c0295eba8ff627ea3
+checksum=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
 replaces="fwupdate>=0"
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*)

From d12e8140436717026cf52ffb31fbef7205e4e844 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 15 Mar 2021 15:58:06 +0100
Subject: [PATCH 0167/2024] New package: libmd-1.0.3

---
 common/shlibs          |  1 +
 srcpkgs/libmd-devel    |  1 +
 srcpkgs/libmd/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libmd-devel
 create mode 100644 srcpkgs/libmd/template

diff --git a/common/shlibs b/common/shlibs
index 23a2a60a01d3..12afc054f282 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3970,3 +3970,4 @@ libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
 libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
 libspdlog.so.1 libspdlog-1.8.2_2
+libmd.so.0 libmd-1.0.3_1
diff --git a/srcpkgs/libmd-devel b/srcpkgs/libmd-devel
new file mode 120000
index 000000000000..3bdbe0fc885e
--- /dev/null
+++ b/srcpkgs/libmd-devel
@@ -0,0 +1 @@
+libmd
\ No newline at end of file
diff --git a/srcpkgs/libmd/template b/srcpkgs/libmd/template
new file mode 100644
index 000000000000..6c708785d350
--- /dev/null
+++ b/srcpkgs/libmd/template
@@ -0,0 +1,27 @@
+# Template file for 'libmd'
+pkgname=libmd
+version=1.0.3
+revision=1
+build_style=gnu-configure
+short_desc="Message Digest functions from BSD systems"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="BSD-3-Clause, BSD-2-Clause, ISC, Beerware, custom:Public Domain"
+homepage="https://www.hadrons.org/software/libmd/"
+distfiles="https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz"
+checksum=5a02097f95cc250a3f1001865e4dbba5f1d15554120f95693c0541923c52af4a
+
+post_install() {
+	vlicense COPYING
+}
+
+libmd-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share
+	}
+}

From c33eb01cf1eaf9386a42883fa245d990d4229bb8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 15 Mar 2021 16:05:46 +0100
Subject: [PATCH 0168/2024] libbsd: update to 0.11.3.

---
 srcpkgs/libbsd/patches/tests-musl.patch | 18 ++++++++++++++++++
 srcpkgs/libbsd/template                 |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libbsd/patches/tests-musl.patch

diff --git a/srcpkgs/libbsd/patches/tests-musl.patch b/srcpkgs/libbsd/patches/tests-musl.patch
new file mode 100644
index 000000000000..0c0043d0d540
--- /dev/null
+++ b/srcpkgs/libbsd/patches/tests-musl.patch
@@ -0,0 +1,18 @@
+--- test/fpurge.c
++++ test/fpurge.c
+@@ -29,15 +29,11 @@
+ int
+ main()
+ {
+-	static FILE fp_bad;
+ 	FILE *fp;
+ 
+ 	if (fpurge(NULL) == 0)
+ 		return 1;
+ 
+-	if (fpurge(&fp_bad) == 0)
+-		return 1;
+-
+ 	fp = fopen("/dev/zero", "r");
+ 	if (fpurge(fp) < 0)
+ 		return 1;
diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 19098cb84aaf..aa36c7f4e0cc 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -1,14 +1,15 @@
 # Template file for 'libbsd'
 pkgname=libbsd
-version=0.10.0
+version=0.11.3
 revision=1
 build_style=gnu-configure
+makedepends="libmd-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"
 homepage="https://libbsd.freedesktop.org/"
 distfiles="https://libbsd.freedesktop.org/releases/libbsd-${version}.tar.xz"
-checksum=34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887
+checksum=ff95cf8184151dacae4247832f8d4ea8800fa127dbd15033ecfe839f285b42a1
 
 post_install() {
 	vlicense COPYING

From c6c4e444075e315d0b4764f2fb226fb972d0e2b5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 08:34:45 +1100
Subject: [PATCH 0169/2024] arena: update homepage; xlint

---
 srcpkgs/arena/template | 11 +++++------
 srcpkgs/arena/update   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/arena/template b/srcpkgs/arena/template
index 05bacdc09f4e..0a82fcea57b9 100644
--- a/srcpkgs/arena/template
+++ b/srcpkgs/arena/template
@@ -1,13 +1,13 @@
 # Template file for 'arena'
 pkgname=arena
 version=1.1
-revision=1
+revision=2
 archs="armv7l i686 x86_64"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Free GUI for chess"
-license="custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:freeware"
+homepage="http://www.playwitharena.de"
 restricted=yes
-homepage="http://www.playwitharena.com"
 
 case "$XBPS_TARGET_MACHINE" in
 	armv7l)
@@ -53,7 +53,6 @@ do_install() {
 
 	vbin arena
 
-	printf "See http://www.playwitharena.com/?Legal_Stuff\n" > LICENSE
+	printf "See http://www.playwitharena.de\n" > LICENSE
 	vlicense LICENSE
 }
-
diff --git a/srcpkgs/arena/update b/srcpkgs/arena/update
index 43232b6b13ad..87d1fb4260f5 100644
--- a/srcpkgs/arena/update
+++ b/srcpkgs/arena/update
@@ -1,2 +1,2 @@
-site=http://www.playwitharena.com/?Download:Arena_for_Linux
+site=http://www.playwitharena.de/?Download:Arena_for_Linux
 pattern="arenalinux_64bit_\K[\d\.]*(?=\.tar\.gz)"

From a39d849f185868899bef29acf61c83c4a5df0635 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 22:23:49 -0700
Subject: [PATCH 0170/2024] eb: fix license

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

diff --git a/srcpkgs/eb/template b/srcpkgs/eb/template
index c372b71c9fcf..9e71add969a7 100644
--- a/srcpkgs/eb/template
+++ b/srcpkgs/eb/template
@@ -1,13 +1,13 @@
 # Template file for 'eb'
 pkgname=eb
 version=4.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="perl"
 makedepends="zlib-devel"
 short_desc="C library and tools for accessing CD-ROM books"
 maintainer="John <me@johnnynator.dev>"
-license="BSD-3"
+license="BSD-3-Clause"
 homepage="https://github.com/2ion/eb"
 distfiles="https://github.com/2ion/eb/archive/${version}.tar.gz"
 checksum=16274f4d5ec34cc37ed308927390a1d0d09e0e6a2b35fbff7d17aacca0524a37

From b3d88e78681b689236056934ae861b07eb3359e1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 22:28:55 -0700
Subject: [PATCH 0171/2024] ecm: fix license

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

diff --git a/srcpkgs/ecm/template b/srcpkgs/ecm/template
index 4fa8689aa680..27c23cb14fa9 100644
--- a/srcpkgs/ecm/template
+++ b/srcpkgs/ecm/template
@@ -1,14 +1,14 @@
 # Template file for 'ecm'
 pkgname=ecm
 version=7.0.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --enable-openmp"
 hostmakedepends="m4"
 makedepends="gmp-devel libgomp-devel"
 short_desc="Elliptic Curve Method for Integer Factorization"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://ecm.gforge.inria.fr/"
 distfiles="https://gforge.inria.fr/frs/download.php/file/36224/ecm-${version}.tar.gz"
 checksum=0cf7b3eee8462cc6f98b418b47630e1eb6b3f4f8c3fc1fb005b08e2a1811ba43

From 0046db55546efd34316132bd3a2a8a13c256d3a4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 22:36:11 -0700
Subject: [PATCH 0172/2024] ecryptfs-utils: fix license

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

diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 3d25252fffe5..6bdc07b97c32 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,8 +1,7 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=9
-lib32disabled=yes
+revision=10
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
@@ -13,10 +12,11 @@ depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ecryptfs.org/"
 distfiles="http://launchpad.net/ecryptfs/trunk/${version}/+download/${pkgname}_${version}.orig.tar.gz"
 checksum=112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f
+lib32disabled=yes
 
 CPPFLAGS="-D_FILE_OFFSET_BITS=64 -I${XBPS_CROSS_BASE}/usr/include/python2.7"
 
@@ -61,4 +61,3 @@ ecryptfs-utils-python_package() {
 		vmove usr/lib/python2.7
 	}
 }
-

From b01b30cc4b3624e20728f5fa3115febaa349ea47 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 22:56:03 -0700
Subject: [PATCH 0173/2024] edac-utils: fix license

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

diff --git a/srcpkgs/edac-utils/template b/srcpkgs/edac-utils/template
index b42ba10f627c..281ece5385c8 100644
--- a/srcpkgs/edac-utils/template
+++ b/srcpkgs/edac-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'edac-utils'
 pkgname=edac-utils
 version=0.18
-revision=1
+revision=2
 build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
 hostmakedepends=perl
 makedepends=libsysfs-devel
-license="GPL-2"
-homepage="https://github.com/grondo/edac-utils"
 short_desc="Userspace helper for kernel EDAC drivers"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/grondo/edac-utils"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=2a027dbde6c3095807c9fbfa0025bedad38fc839e9967707c1986089ff4c8750
 

From 1162c322088a79e4e2686a8c0f44d665e00552ea Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 23:12:23 -0700
Subject: [PATCH 0174/2024] embb: fix license

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

diff --git a/srcpkgs/embb/template b/srcpkgs/embb/template
index 301d38f9d7cf..0906831c53e3 100644
--- a/srcpkgs/embb/template
+++ b/srcpkgs/embb/template
@@ -1,12 +1,12 @@
 # Template file for 'embb'
 pkgname=embb
 version=1.0.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTS=OFF -DINSTALL_PREFIX=/usr"
 short_desc="Library for parallel programming of embedded systems"
 maintainer="Florian Eich <flrn@nrmncr.net>"
-license="BSD-2"
+license="BSD-2-Clause"
 homepage="https://embb.io/"
 distfiles="https://github.com/siemens/embb/releases/download/v${version}/embb-${version}.tar.gz"
 checksum=a392c710df719bbb1513dd9a6835ab9d73494d7355a47f17e818179fea64dcc8

From 679771853b6ac9fde9a2f25e05ae950461215207 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 23:22:45 -0700
Subject: [PATCH 0175/2024] enblend-enfuse: fix license

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

diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 2e329d18d16d..9401bc3544be 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'enblend-enfuse'
 pkgname=enblend-enfuse
 version=4.2
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-openmp --with-tcmalloc"
 hostmakedepends="pkg-config perl automake"
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
  gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
 short_desc="Tools for for combining multiple images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://enblend.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/enblend/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
 checksum=8703e324939ebd70d76afd350e56800f5ea2c053a040a5f5218b2a1a4300bd48

From 063f05c9f69a42127d943c1561c456c9789c32aa Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 23:34:57 -0700
Subject: [PATCH 0176/2024] enca: fix license

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

diff --git a/srcpkgs/enca/template b/srcpkgs/enca/template
index 74531a3a3896..953affcfa5f6 100644
--- a/srcpkgs/enca/template
+++ b/srcpkgs/enca/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends="recode-devel"
 short_desc="Extremely Naive Charset Analyser and converter"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://cihar.com/software/enca/"
 distfiles="http://dl.cihar.com/enca/enca-${version}.tar.xz"
 checksum=3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8

From 1d6dc59f35e49841c8d4850b66d9af5202fe62c6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 23:37:22 -0700
Subject: [PATCH 0177/2024] enchant: fix license

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

diff --git a/srcpkgs/enchant/template b/srcpkgs/enchant/template
index 52dfb644e290..bc7ca9e5239d 100644
--- a/srcpkgs/enchant/template
+++ b/srcpkgs/enchant/template
@@ -8,9 +8,9 @@ configure_args="--disable-zemberek --disable-ispell --disable-aspell
 hostmakedepends="automake libtool pkg-config"
 makedepends="glib-devel hunspell-devel"
 short_desc="Generic spell checking library"
-homepage="http://www.abisource.com/projects/enchant/"
-license="LGPL-2.1"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="http://www.abisource.com/projects/enchant/"
 distfiles="http://www.abisource.com/downloads/enchant/${version}/enchant-${version}.tar.gz"
 checksum=2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f
 patch_args="-Np1"

From 804b285b92468c02a535d93d09ad23673345164f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 23:42:30 -0700
Subject: [PATCH 0178/2024] enscript: fix license

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

diff --git a/srcpkgs/enscript/template b/srcpkgs/enscript/template
index c38745fffa0c..162d8bf9adf4 100644
--- a/srcpkgs/enscript/template
+++ b/srcpkgs/enscript/template
@@ -1,13 +1,13 @@
 # Template file for 'enscript'
 pkgname=enscript
 version=1.6.6
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="perl"
 conf_files="/etc/enscript.cfg"
 short_desc="Converts text to Postscript, HTML or RTF with syntax highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://git.savannah.gnu.org/cgit/enscript.git"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb

From 568a49049d5987230489d15e66a4a3624329f566 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 23:42:43 -0700
Subject: [PATCH 0179/2024] eperiodique: fix license

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

diff --git a/srcpkgs/eperiodique/template b/srcpkgs/eperiodique/template
index 5190e52a9c58..36be6d547a2a 100644
--- a/srcpkgs/eperiodique/template
+++ b/srcpkgs/eperiodique/template
@@ -1,15 +1,15 @@
 # Template file for 'eperiodique'
 pkgname=eperiodique
 version=0.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="efl-devel"
 depends="desktop-file-utils"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Simple periodic table of elements viewer"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/eperiodique/"
-license="2-clause-BSD"
 distfiles="${SOURCEFORGE_SITE}/eperiodique/${version}/eperiodique-${version}.tar.bz2"
 checksum=b2c15785e37e469ddb149e6110db453f4d2a97324e3d2998c34081505787d52d
 

From 909af05dab7cedc8a3518af15efe2906ff5bdb79 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 23:46:32 -0700
Subject: [PATCH 0180/2024] eukleides: fix license

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

diff --git a/srcpkgs/eukleides/template b/srcpkgs/eukleides/template
index 18543b392caa..a955ef5bc911 100644
--- a/srcpkgs/eukleides/template
+++ b/srcpkgs/eukleides/template
@@ -1,13 +1,13 @@
 # Template file for 'eukleides'
 pkgname=eukleides
 version=1.5.4
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="flex texinfo"
 makedepends="readline-devel"
 short_desc="Computer language devoted to elementary plane geometry"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.eukleides.org/"
 distfiles="http://www.eukleides.org/files/${pkgname}-${version}.tar.bz2"
 checksum=18c489460cb2cb98f4ea9c0187519ef77b4422117fd43bcd4e4836580ef40c69

From 4674b124b05bd422f514a26c512c0d0a6ad1bf85 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 23:56:57 -0700
Subject: [PATCH 0181/2024] extundelete: fix license

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

diff --git a/srcpkgs/extundelete/template b/srcpkgs/extundelete/template
index ed3a364d42ca..3ae6119c38dc 100644
--- a/srcpkgs/extundelete/template
+++ b/srcpkgs/extundelete/template
@@ -1,12 +1,12 @@
 # Template file for 'extundelete'
 pkgname=extundelete
 version=0.2.4
-revision=4
+revision=5
 build_style=gnu-configure
 makedepends="e2fsprogs-devel"
-short_desc="ext3/ext4 file recover utility"
+short_desc="File recover utility for ext3/ext4"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
 homepage="http://extundelete.sourceforge.net"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4

From eea00c75ae94d43f93005264d86045a53e872a11 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 30 Mar 2021 22:09:38 +0300
Subject: [PATCH 0182/2024] github-cli: update to 1.8.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 38b0f180487e..77357dc600ad 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.7.0
+version=1.8.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=8d737d4e4a2943ca6e08c030c0992468162de0fc1366862d101b8e1389bdc36a
+checksum=13576c42a0cb1486370b876eccebe498c1ef84868893ae41a1f717229be4d6bb
 
 pre_build() {
 	local _date

From 5b0312a7fb7a7b39802fcb776efd80e11ce5c27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 30 Mar 2021 16:17:26 -0300
Subject: [PATCH 0183/2024] linux5.11: update to 5.11.11.

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

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 76782f2dd5bb..a75cd56b0de8 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.9
+version=5.11.11
 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="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- ef1e9f434651570ef0e47f0695a3fa9fc92e46f5bd53b3e0cfa6b8c46da2bce6"
+ e5e0f6b2e0137e6a8afcfea7aca1c3f1ac1b5c72debcc79f3cb4ddd84df3f199"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 534b68076efc311d3aaabd877754ad00a9e9eb88 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 30 Mar 2021 22:22:10 +0300
Subject: [PATCH 0184/2024] xwinwrap: fix homepage link

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

diff --git a/srcpkgs/xwinwrap/template b/srcpkgs/xwinwrap/template
index 35e7cf1b5960..7dbffb515f54 100644
--- a/srcpkgs/xwinwrap/template
+++ b/srcpkgs/xwinwrap/template
@@ -7,7 +7,7 @@ makedepends="libXrender-devel"
 short_desc="X11 Window as background"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
-homepage="https://github.com/Aaahh/xwinwrap"
+homepage="https://github.com/mmhobi7/xwinwrap"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=0e840586deaf6780d426dc49f7a344366198aead96535cc1eb2ac7ce366777df
 

From 0a6e849648649cb37bc2ff9cec948c6181a92b40 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 16:11:04 +1100
Subject: [PATCH 0185/2024] gtkwave: update to 3.3.108.

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

diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template
index 196a73cb5480..277b13897c0f 100644
--- a/srcpkgs/gtkwave/template
+++ b/srcpkgs/gtkwave/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkwave'
 pkgname=gtkwave
-version=3.3.107
+version=3.3.108
 revision=1
 build_style=gnu-configure
 configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib"
@@ -11,7 +11,7 @@ maintainer="allan <mail@may.mooo.com>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://gtkwave.sourceforge.net/"
 distfiles="http://gtkwave.sourceforge.net/gtkwave-${version}.tar.gz"
-checksum=48fe630b0d42585d702dc967c7db8803c6ba68b465ad6697a68aabc08f8576c5
+checksum=ece447340442e7ad029713789552e8392b75dd3808c882ac5193d42fce55eb3b
 
 post_install() {
 	vlicense LICENSE.TXT

From 116ad2b782f78e90afd6a10f2f6d04c2d5fc6277 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 02:16:31 +1100
Subject: [PATCH 0186/2024] cross-arm-none-eabi-newlib: fix distfiles

Also fix xlint warnings.
---
 srcpkgs/cross-arm-none-eabi-newlib/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/cross-arm-none-eabi-newlib/template b/srcpkgs/cross-arm-none-eabi-newlib/template
index a5c27a2ce795..0e1917ee0e10 100644
--- a/srcpkgs/cross-arm-none-eabi-newlib/template
+++ b/srcpkgs/cross-arm-none-eabi-newlib/template
@@ -3,7 +3,7 @@ _triplet=arm-none-eabi
 _pkgname=newlib
 pkgname=cross-${_triplet}-${_pkgname}
 version=3.1.0.20181231
-revision=2
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-configure
 configure_args="
@@ -14,9 +14,9 @@ configure_args="
 hostmakedepends="cross-arm-none-eabi-binutils cross-arm-none-eabi-gcc"
 short_desc="C library intended for use on embedded systems"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
-license="GPL-3.0-or-later"
-homepage="https://www.sourceware.org/${_pkgname}/"
-distfiles="ftp://sources.redhat.com/pub/${_pkgname}/${_pkgname}-${version}.tar.gz"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://www.sourceware.org/newlib/"
+distfiles="ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"
 checksum=9e12fea7297648b114434033ed4458755afe7b9b6c7d58123389e82bd37681c0
 nostrip=yes
 
@@ -71,7 +71,3 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 	popd
 }
-
-post_install() {
-	vlicense COPYING
-}

From f9909093ca1c21bffb48f1f55a2b1d8313f0dec2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 15:21:46 -0700
Subject: [PATCH 0187/2024] dunelegacy: fix license, fix checkdepends

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

diff --git a/srcpkgs/dunelegacy/template b/srcpkgs/dunelegacy/template
index 244c637c967a..b9373d6d47d0 100644
--- a/srcpkgs/dunelegacy/template
+++ b/srcpkgs/dunelegacy/template
@@ -1,13 +1,14 @@
 # Template file for 'dunelegacy'
 pkgname=dunelegacy
 version=0.96.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-sdltest"
 makedepends="SDL2_mixer-devel"
+checkdepends="libcppunit-devel"
 short_desc="Modern Dune II reimplementation"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://dunelegacy.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}-src.tar.bz2"
 checksum=4740df9e94712b34f5d6fa1ca3c24658c4808b40431aa156ed66c318be9f4de8

From 2a7766a8ebd7656c70a18247d62fcc2d0d892c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 30 Mar 2021 17:22:30 -0300
Subject: [PATCH 0188/2024] linux5.11: fix dotconfig.

- for some reason XEN_MEMORY_HOTPLUG_LIMIT wasn't requested when I built
it initially
- remove AD9467, because we don't provide its requirements
---
 srcpkgs/linux5.11/files/i386-dotconfig   |  3 +--
 srcpkgs/linux5.11/files/x86_64-dotconfig | 11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/linux5.11/files/i386-dotconfig b/srcpkgs/linux5.11/files/i386-dotconfig
index 8be6f073bf13..ea17267e3cc1 100644
--- a/srcpkgs/linux5.11/files/i386-dotconfig
+++ b/srcpkgs/linux5.11/files/i386-dotconfig
@@ -8304,8 +8304,7 @@ CONFIG_AD7887=m
 CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
-CONFIG_AD9467=m
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_AD9467 is not set
 # CONFIG_AXP20X_ADC is not set
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
diff --git a/srcpkgs/linux5.11/files/x86_64-dotconfig b/srcpkgs/linux5.11/files/x86_64-dotconfig
index dae7db0d64aa..140c48f0ef13 100644
--- a/srcpkgs/linux5.11/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.11/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.11.1 Kernel Configuration
+# Linux/x86_64 5.11.11 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -248,6 +248,7 @@ CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -1999,7 +2000,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_BW is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
@@ -7792,6 +7792,7 @@ CONFIG_HYPERV_BALLOON=m
 #
 CONFIG_XEN_BALLOON=y
 # CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_BACKEND=y
@@ -8166,9 +8167,6 @@ CONFIG_INTEL_MFLD_THERMAL=m
 CONFIG_INTEL_MID_POWER_BUTTON=m
 CONFIG_INTEL_MRFLD_PWRBTN=m
 CONFIG_INTEL_PMC_CORE=y
-# CONFIG_INTEL_PMT_CLASS is not set
-# CONFIG_INTEL_PMT_TELEMETRY is not set
-# CONFIG_INTEL_PMT_CRASHLOG is not set
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_SCU_IPC=y
 CONFIG_INTEL_SCU=y
@@ -8441,8 +8439,7 @@ CONFIG_AD7887=m
 CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
-CONFIG_AD9467=m
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_AD9467 is not set
 # CONFIG_AXP20X_ADC is not set
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m

From 440d7c3c903d32c9c13112f13efeaf2153d3368a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 30 Mar 2021 23:42:46 +0300
Subject: [PATCH 0189/2024] butt: update to 0.1.29.

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

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index a084c606c02b..0ad1ad90e114 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,6 +1,6 @@
 # Template file for 'butt'
 pkgname=butt
-version=0.1.28
+version=0.1.29
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://danielnoethen.de/butt/"
 changelog="https://danielnoethen.de/butt/Changelog.html"
 distfiles="${SOURCEFORGE_SITE}/butt/butt-${version}.tar.gz"
-checksum=d5a966d768746432610e0d7fe10c504e45c5aabb0b2be24da35779dacc2677e5
+checksum=8f62ae9bcb3a3a697dfdca95459bb02f18c61f490504cb6d853bcfd3c8077f59

From 8e3dce399273b151efeba857975d5f7401d6f3c8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 30 Mar 2021 14:42:37 -0500
Subject: [PATCH 0190/2024] nvidia390: add patches for linux 5.11

---
 srcpkgs/nvidia390/files/linux-5.11.patch | 348 +++++++++++++++++++++++
 srcpkgs/nvidia390/template               |   4 +-
 2 files changed, 351 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia390/files/linux-5.11.patch

diff --git a/srcpkgs/nvidia390/files/linux-5.11.patch b/srcpkgs/nvidia390/files/linux-5.11.patch
new file mode 100644
index 000000000000..f08c8fcad1ef
--- /dev/null
+++ b/srcpkgs/nvidia390/files/linux-5.11.patch
@@ -0,0 +1,348 @@
+Adapted by Ike Devolder:
+https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/blob/herecura/linux-5.11.patch
+
+from Joan Bruguera's patch for 460xx:
+https://gist.github.com/joanbm/cf75fc567aef271c830a0fcdfc25a94a
+
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 0d7e516..dae9c09 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -115,7 +115,9 @@
+
+ #include <linux/moduleparam.h>      /* module_param()                   */
+ #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ #include <asm/kmap_types.h>         /* page table entry lookup          */
++#endif
+
+ #include <linux/pci.h>              /* pci_find_class, etc              */
+ #include <linux/interrupt.h>        /* tasklets, interrupt helpers      */
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 23aca36..cc9543b 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1729,6 +1729,8 @@ compile_test() {
+             # Determine if the DRM subsystem is usable
+             #
+             CODE="
++            #include <linux/version.h>
++
+             #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
+             #endif
+@@ -1737,6 +1739,10 @@ compile_test() {
+             #include <drm/drm_drv.h>
+             #endif
+
++            #if defined(NV_DRM_DRM_GEM_H_PRESENT)
++            #include <drm/drm_gem.h>
++            #endif
++
+             #if defined(NV_DRM_DRM_PRIME_H_PRESENT)
+             #include <drm/drm_prime.h>
+             #endif
+@@ -1746,13 +1752,22 @@ compile_test() {
+             #endif
+
+             void conftest_drm_available(void) {
+-                struct drm_driver drv;
+
+                 /* 2013-01-15 89177644a7b6306e6084a89eab7e290f4bfef397 */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
++                // Avoid failure due to all the changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++                struct drm_driver drv;
+                 drv.gem_prime_pin = 0;
+                 drv.gem_prime_get_sg_table = 0;
+                 drv.gem_prime_vmap = 0;
+                 drv.gem_prime_vunmap = 0;
++#else
++                struct drm_gem_object_funcs gem;
++                gem.pin = 0;
++                gem.get_sg_table = 0;
++                gem.vmap = 0;
++                gem.vunmap = 0;
++#endif
+                 (void)drm_gem_prime_import;
+                 (void)drm_gem_prime_export;
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.c b/kernel/nvidia-drm/nvidia-drm-crtc.c
+index 780df0e..35eb1e4 100644
+--- a/kernel/nvidia-drm/nvidia-drm-crtc.c
++++ b/kernel/nvidia-drm/nvidia-drm-crtc.c
+@@ -20,6 +20,7 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -336,9 +337,19 @@ static int head_modeset_config_attach_connector(
+  * the 'nv_drm_crtc_state::req_config', that is fine becase 'nv_drm_crtc_state'
+  * will be discarded if ->atomic_check() fails.
+  */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc,
+                                     struct drm_crtc_state *crtc_state)
++#else
++// Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc,
++                                    struct drm_atomic_state *atomic_state)
++#endif
+ {
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0))
++    // Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++    struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(atomic_state, crtc);
++#endif
+     struct nv_drm_crtc_state *nv_crtc_state = to_nv_crtc_state(crtc_state);
+     struct NvKmsKapiHeadRequestedConfig *req_config =
+         &nv_crtc_state->req_config;
+@@ -408,8 +419,14 @@ static void nv_drm_crtc_disable(struct drm_crtc *crtc)
+ }
+
+ #ifdef NV_DRM_CRTC_HELPER_FUNCS_HAS_ATOMIC_ENABLE
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ static void nv_drm_crtc_atomic_enable(struct drm_crtc *crtc,
+                                       struct drm_crtc_state *old_crtc_state)
++#else
++// Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++static void nv_drm_crtc_atomic_enable(struct drm_crtc *crtc,
++                                      struct drm_atomic_state *old_atomic_state)
++#endif
+ {
+
+ }
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index 1b4cc6d..0c26646 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -20,6 +20,7 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */
+
+ #include "nvidia-drm-priv.h"
+@@ -700,10 +701,13 @@ static struct drm_driver nv_drm_driver = {
+     .num_ioctls             = ARRAY_SIZE(nv_drm_ioctls),
+
+     .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
++    // Deprecated in favour of equivalent in drm_get_object in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
+     .gem_prime_export       = nv_drm_gem_prime_export,
+     .gem_prime_get_sg_table = nv_drm_gem_prime_get_sg_table,
+     .gem_prime_vmap         = nv_drm_gem_prime_vmap,
+     .gem_prime_vunmap       = nv_drm_gem_prime_vunmap,
++#endif
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+     .gem_prime_res_obj      = nv_drm_gem_prime_res_obj,
+@@ -727,11 +731,14 @@ static struct drm_driver nv_drm_driver = {
+     .desc                   = "NVIDIA DRM driver",
+     .date                   = "20160202",
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
++    // This is now behind a CONFIG_DRM_LEGACY Kconfig flag.(torvalds/linux commit 57bb1ee6034046be70aed33fd6d447bb2b7261fa)
+ #if defined(NV_DRM_DRIVER_HAS_LEGACY_DEV_LIST)
+     .legacy_dev_list        = LIST_HEAD_INIT(nv_drm_driver.legacy_dev_list),
+ #else
+     .device_list            = LIST_HEAD_INIT(nv_drm_driver.device_list),
+ #endif
++#endif
+ };
+
+
+@@ -758,8 +765,6 @@ static void nv_drm_update_drm_driver_features(void)
+     nv_drm_driver.dumb_create      = nv_drm_dumb_create;
+     nv_drm_driver.dumb_map_offset  = nv_drm_dumb_map_offset;
+     nv_drm_driver.dumb_destroy     = drm_gem_dumb_destroy;
+-
+-    nv_drm_driver.gem_vm_ops       = &nv_drm_gem_vma_ops;
+ #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+ }
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
+index 4ac4559..28ef84c 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
++++ b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
+@@ -20,6 +20,7 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_AVAILABLE)
+@@ -32,6 +33,8 @@
+ #include "nvidia-drm-helper.h"
+ #include "nvidia-drm-ioctl.h"
+
++#include "linux/dma-buf.h"
++
+ static inline
+ void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem)
+ {
+@@ -54,6 +57,7 @@ static struct sg_table *__nv_drm_gem_user_memory_prime_get_sg_table(
+                                     nv_user_memory->pages_count);
+ }
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ static void *__nv_drm_gem_user_memory_prime_vmap(
+     struct nv_drm_gem_object *nv_gem)
+ {
+@@ -69,6 +73,28 @@ static void __nv_drm_gem_user_memory_prime_vunmap(
+ {
+     nv_drm_vunmap(address);
+ }
++#else
++// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers
++// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc
++static int __nv_drm_gem_user_memory_prime_vmap(
++    struct nv_drm_gem_object *nv_gem,
++    struct dma_buf_map *map)
++{
++    struct nv_drm_gem_user_memory *nv_user_memory = to_nv_user_memory(nv_gem);
++
++    map->vaddr = nv_drm_vmap(nv_user_memory->pages,
++                           nv_user_memory->pages_count);
++    map->is_iomem = false;
++    return 0;
++}
++
++static void __nv_drm_gem_user_memory_prime_vunmap(
++    struct nv_drm_gem_object *gem,
++    struct dma_buf_map *map)
++{
++    nv_drm_vunmap(map->vaddr);
++}
++#endif
+
+ static struct nv_drm_gem_object_funcs __nv_gem_user_memory_ops = {
+     .free = __nv_drm_gem_user_memory_free,
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c
+index 4ab8b36..9556993 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.c
++++ b/kernel/nvidia-drm/nvidia-drm-gem.c
+@@ -20,6 +20,7 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_AVAILABLE)
+@@ -29,6 +30,7 @@
+ #include "nvidia-drm-prime-fence.h"
+ #include "nvidia-drm-gem.h"
+ #include "nvidia-dma-resv-helper.h"
++#include "nvidia-drm-gem-nvkms-memory.h"
+
+ #if defined(NV_DRM_DRM_PRIME_H_PRESENT)
+ #include <drm/drm_prime.h>
+@@ -56,6 +58,13 @@ void nv_drm_gem_free(struct drm_gem_object *gem)
+ static struct drm_gem_object_funcs nv_drm_gem_funcs = {
+     .free = nv_drm_gem_free,
+     .get_sg_table = nv_drm_gem_prime_get_sg_table,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0))
++    // New functions moved from drm_driver because of torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++    .export       = drm_gem_prime_export,
++    .vmap         = nv_drm_gem_prime_vmap,
++    .vunmap       = nv_drm_gem_prime_vunmap,
++    .vm_ops       = &nv_drm_gem_vma_ops,
++#endif
+ };
+ #endif
+
+@@ -124,6 +133,7 @@ struct sg_table *nv_drm_gem_prime_get_sg_table(struct drm_gem_object *gem)
+     return ERR_PTR(-ENOTSUPP);
+ }
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ void *nv_drm_gem_prime_vmap(struct drm_gem_object *gem)
+ {
+     struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
+@@ -143,6 +153,29 @@ void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, void *address)
+         nv_gem->ops->prime_vunmap(nv_gem, address);
+     }
+ }
++#else
++// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers
++// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc
++int nv_drm_gem_prime_vmap(struct drm_gem_object *gem, struct dma_buf_map *map)
++{
++    struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
++
++    if (nv_gem->ops->prime_vmap != NULL) {
++        return nv_gem->ops->prime_vmap(nv_gem, map);
++    }
++
++    return -ENOTSUPP;
++}
++
++void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, struct dma_buf_map *map)
++{
++    struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
++
++    if (nv_gem->ops->prime_vunmap != NULL) {
++        nv_gem->ops->prime_vunmap(nv_gem, map);
++    }
++}
++#endif
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+ nv_dma_resv_t* nv_drm_gem_prime_res_obj(struct drm_gem_object *obj)
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
+index fd64b2d..e12fafb 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.h
++++ b/kernel/nvidia-drm/nvidia-drm-gem.h
+@@ -23,6 +23,7 @@
+ #ifndef __NVIDIA_DRM_GEM_H__
+ #define __NVIDIA_DRM_GEM_H__
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_AVAILABLE)
+@@ -44,13 +45,22 @@
+ #include "nvidia-dma-resv-helper.h"
+ #endif
+
++#include "linux/dma-buf.h"
++
+ struct nv_drm_gem_object;
+
+ struct nv_drm_gem_object_funcs {
+     void (*free)(struct nv_drm_gem_object *nv_gem);
+     struct sg_table *(*prime_get_sg_table)(struct nv_drm_gem_object *nv_gem);
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+     void *(*prime_vmap)(struct nv_drm_gem_object *nv_gem);
+     void (*prime_vunmap)(struct nv_drm_gem_object *nv_gem, void *address);
++#else
++    // Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers
++    // See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc
++    int (*prime_vmap)(struct nv_drm_gem_object *nv_gem, struct dma_buf_map *map);
++    void (*prime_vunmap)(struct nv_drm_gem_object *nv_gem, struct dma_buf_map *map);
++#endif
+ };
+
+ struct nv_drm_gem_object {
+@@ -185,9 +195,17 @@ void nv_drm_gem_object_init(struct nv_drm_device *nv_dev,
+
+ struct sg_table *nv_drm_gem_prime_get_sg_table(struct drm_gem_object *gem);
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ void *nv_drm_gem_prime_vmap(struct drm_gem_object *gem);
+
+ void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, void *address);
++#else
++// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers
++// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc
++int nv_drm_gem_prime_vmap(struct drm_gem_object *gem, struct dma_buf_map *map);
++
++void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, struct dma_buf_map *map);
++#endif
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+ nv_dma_resv_t* nv_drm_gem_prime_res_obj(struct drm_gem_object *obj);
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 34451d50c610..223015cd21cd 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.141
-revision=2
+revision=3
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -36,6 +36,8 @@ do_extract() {
 	cd ${wrksrc}
 	./${_pkg}.run --extract-only
 	rm -f ${_pkg}.run
+	cd ${_pkg}
+	patch -Np1 < ${FILESDIR}/linux-5.11.patch
 }
 
 pre_install() {

From 66f50e9f5f5b20345e83200e995da2fe80a7e8ee Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 30 Mar 2021 08:42:40 -0500
Subject: [PATCH 0191/2024] plantuml: update to 1.2021.3.

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

diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index 201a3258ce4e..841ca0d06e41 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,19 +1,22 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.0
+version=1.2021.3
 revision=1
 create_wrksrc=yes
-hostmakedepends="unzip"
+hostmakedepends="apache-ant openjdk8"
 depends="virtual?java-environment graphviz"
 short_desc="Create UML diagrams from a plain text language"
 maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-jar-gplv2-${version}.zip"
-checksum=8825fd153063765f76c6039d131940cbf720e1599089ac9ad5e5814ec8ca9e99
+distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
+checksum=12cdf0b3664ffd16fa05a52c589845d47a12ac99e2beb2309e73d3c122751e23
 
 do_build() {
+	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/apache-ant.sh
+	ant
 	mv ${pkgname}.jar ${pkgname}-${version}.jar
 	echo "#!/bin/sh" > plantuml
 	echo "java -jar /usr/share/java/${pkgname}-${version}.jar \$@" >> plantuml

From dd32a280bc9a1bd711ae84ab7c2d4aea093992a1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 20 Mar 2021 20:02:00 -0600
Subject: [PATCH 0192/2024] xf86-video-intel: update to 2.99.917.20210115.

Also, switch to the actual gitlab and fetch the tarball directly.
---
 srcpkgs/xf86-video-intel/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index a7408b88c10c..2b589d009897 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -1,9 +1,10 @@
 # Template file for 'xf86-video-intel'
 pkgname=xf86-video-intel
-version=2.99.917.20200515
+version=2.99.917.20210115
 revision=1
-_commit=5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc
+_commit=31486f40f8e8f8923ca0799aea84b58799754564
 archs="i686* x86_64*"
+wrksrc="xf86-video-intel-master-${_commit}"
 build_style=gnu-configure
 configure_args="--with-default-dri=3"
 hostmakedepends="git automake libtool pkg-config xorg-util-macros"
@@ -13,20 +14,14 @@ depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg DDX Intel video driver"
 maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="MIT"
-homepage="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel"
+homepage="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/"
+distfiles="${homepage}/-/archive/master/xf86-video-intel-${_commit}.tar.gz"
+checksum=3cdcf2f84bddf9e9174a8413d8fc855dae893dbc53889329978dec62ee8f6e62
 lib32disabled=yes
 
 CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-do_fetch() {
-	git clone --single-branch \
-		https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git \
-		${wrksrc}
-	cd ${wrksrc}
-	git reset --hard ${_commit}
-}
-
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From 676fb77e6f4c855c1f9485126f50b114aaf188c8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Tue, 2 Mar 2021 18:24:34 -0700
Subject: [PATCH 0193/2024] zeek: update to 4.0.0.

---
 common/shlibs                      |  6 ++---
 srcpkgs/zeek/patches/timeval.patch | 40 ++++++++++++++++++++++++++++++
 srcpkgs/zeek/template              |  8 +++---
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/zeek/patches/timeval.patch

diff --git a/common/shlibs b/common/shlibs
index 12afc054f282..76ae19e5f705 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,9 +3532,9 @@ libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
 libbroker.so.2 zeek-3.2.4_2
-libcaf_core.so.0.17.6 zeek-3.2.4_2
-libcaf_io.so.0.17.6 zeek-3.2.4_2
-libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+libcaf_core.so.0.18.0 zeek-4.0.0_1
+libcaf_io.so.0.18.0 zeek-4.0.0_1
+libcaf_openssl.so.0.18.0 zeek-4.0.0_1
 libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
diff --git a/srcpkgs/zeek/patches/timeval.patch b/srcpkgs/zeek/patches/timeval.patch
new file mode 100644
index 000000000000..47f0730becde
--- /dev/null
+++ b/srcpkgs/zeek/patches/timeval.patch
@@ -0,0 +1,40 @@
+--- src/util.h.orig
++++ src/util.h
+@@ -29,6 +29,17 @@
+ #include <vector>
+ #include <memory> // std::unique_ptr
+ 
++#ifdef TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# ifdef HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
++
+ #ifdef DEBUG
+ 
+ #include <assert.h>
+--- src/util.cc.orig
++++ src/util.cc
+@@ -5,17 +5,6 @@
+ 
+ #include "zeek/util.h"
+ 
+-#ifdef TIME_WITH_SYS_TIME
+-# include <sys/time.h>
+-# include <time.h>
+-#else
+-# ifdef HAVE_SYS_TIME_H
+-#  include <sys/time.h>
+-# else
+-#  include <time.h>
+-# endif
+-#endif
+-
+ #ifdef HAVE_DARWIN
+ #include <mach/task.h>
+ #include <mach/mach_init.h>
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 408b3fe11407..13625e90c744 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,9 +1,10 @@
 # Template file for 'zeek'
 pkgname=zeek
-version=3.2.4
-revision=2
+version=4.0.0
+revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
+configure_args="-DCMAKE_INSTALL_LIBDIR=lib"
 hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
 makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
@@ -12,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.zeek.org"
 distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz"
-checksum=d5a984d383c0cc337e18d3d65b969e8566ab8a6fc38e9c6d39ba4a101027be85
+checksum=f2eedab3262eaa3f58a83442b1f38bad35ed72399564917b71bba42266f1ff54
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel musl-legacy-compat"
@@ -61,6 +62,7 @@ zeek-devel_package() {
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/share/zeek/cmake
+		vmove usr/lib/cmake
 	}
 }
 

From e1072640814063cace1cef841d5679bc58cf2feb Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 09:18:01 +1100
Subject: [PATCH 0194/2024] djvulibre: fix checksum

Tarball contents didn't change. SourceForge changed tar implementation
from POSIX tar to GNU tar.
---
 srcpkgs/djvulibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index 1425c4835016..6a2ba0b648f5 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://djvu.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/djvu/$pkgname-$version.tar.gz"
-checksum=82e392a9cccfee94fa604126c67f06dbc43ed5f9f0905d15b6c8164f83ed5655
+checksum=fcd009ea7654fde5a83600eb80757bd3a76998e47d13c66b54c8db849f8f2edc
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From 4b9f955750a1b3acbb876de410ef410711ea85da 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, 17 Mar 2021 08:08:39 +0700
Subject: [PATCH 0195/2024] fntsample: depends on unicode-character-database

---
 srcpkgs/fntsample/template | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/fntsample/template b/srcpkgs/fntsample/template
index 500c58ff5521..ab1e4ae7eb8a 100644
--- a/srcpkgs/fntsample/template
+++ b/srcpkgs/fntsample/template
@@ -1,33 +1,19 @@
 # Template file for 'fntsample'
 pkgname=fntsample
 version=5.3
-revision=1
-build_style=cmake
+revision=2
 wrksrc="fntsample-release-${version}"
-configure_args="-DUNICODE_BLOCKS=../Blocks.txt"
+build_style=cmake
+configure_args="-DUNICODE_BLOCKS=/usr/share/unicode/Blocks.txt"
 make_cmd=make
-hostmakedepends="gettext pkg-config"
+hostmakedepends="gettext pkg-config unicode-character-database"
 makedepends="cairo-devel fontconfig-devel freetype-devel glib-devel pango-devel"
 short_desc="PDF and PostScript font samples generator"
 maintainer="svenper <svenper@tuta.io>"
-license="GPL-3.0-or-later, BSD-3-Clause"
+license="GPL-3.0-or-later"
 homepage="https://github.com/eugmes/fntsample"
 changelog="https://raw.githubusercontent.com/eugmes/fntsample/master/ChangeLog"
-distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz
- https://unicode.org/Public/11.0.0/ucd/Blocks.txt
- https://unicode.org/terms_of_use.html"
-checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b
- 0b457b66c788a97c8521e265f0b793d4ed911356d39eb61029f9cef8554cd052
- e64365d338b707f1bac79d9391c7579eb6db270c49b711bc1665ae8e7e36173d"
-skip_extraction="Blocks.txt
- terms_of_use.html"
+distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz"
+checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b"
 
 export CMAKE_GENERATOR="Unix Makefiles"
-
-post_extract() {
-	cp "${XBPS_SRCDISTDIR}/fntsample-${version}/Blocks.txt" "${wrksrc}/"
-}
-
-post_install() {
-	vlicense "${XBPS_SRCDISTDIR}/fntsample-${version}/terms_of_use.html"
-}

From 7afacc0ac4a738f26e777cb1e12e4a4505ea2afa 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, 25 Mar 2021 21:28:34 +0700
Subject: [PATCH 0196/2024] jwm-settings-manager: remove package

- upstream disappeared
- only NixOS and VoidLinux shipes this package
---
 srcpkgs/jwm-settings-manager/template | 13 -------------
 srcpkgs/removed-packages/template     |  1 +
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 srcpkgs/jwm-settings-manager/template

diff --git a/srcpkgs/jwm-settings-manager/template b/srcpkgs/jwm-settings-manager/template
deleted file mode 100644
index fc09f90e26ce..000000000000
--- a/srcpkgs/jwm-settings-manager/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'jwm-settings-manager'
-pkgname=jwm-settings-manager
-version=2.1.5
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config fltk"
-makedepends="fltk-devel libXpm-devel"
-short_desc="Full configuration manager for JWM"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/Israel-D/jwm-settings-manager"
-distfiles="https://github.com/Israel-D/jwm-settings-manager/archive/${version}.tar.gz"
-checksum=087629efb99ed3c7dea1dabd2c33de6dd75f3fe5f0d1d8e5fc8cfa788cd30beb
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 133a72f3146a..fb4a374d98c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -177,6 +177,7 @@ replaces="
  icecat-i18n-zh-TW<=78.6.1_1
  isl16<=0.16_2
  js<=1.8.5_11
+ jwm-settings-manager<=2.1.5_1
  k3s<=1.0.0_1
  kadu<=4.3_6
  keepassx<=0.4.4_2

From a57d03f20c26ba37407e3a39b249c80204f98ad8 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 10:56:02 +1100
Subject: [PATCH 0197/2024] libofx: update to 0.10.1.

---
 common/shlibs           | 2 +-
 srcpkgs/libofx/template | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 76ae19e5f705..4a81ffd64e21 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1563,7 +1563,7 @@ libcheck.so.0 check-0.9.12_1
 liblxc.so.1 liblxc-4.0.6_2
 libtcmalloc.so.4 gperftools-2.1_1
 libaio.so.1 libaio-0.3.109_1
-libofx.so.7 libofx-0.9.11_1
+libofx.so.7 libofx-0.10.1_1
 libsigsegv.so.2 libsigsegv-2.10_2
 libfprint.so.0 libfprint0-1.0_1
 libfprint-2.so.2 libfprint-1.90.7_1
diff --git a/srcpkgs/libofx/template b/srcpkgs/libofx/template
index 97d4d7649c89..342df26beac0 100644
--- a/srcpkgs/libofx/template
+++ b/srcpkgs/libofx/template
@@ -1,18 +1,19 @@
 # Template file for 'libofx'
 pkgname=libofx
-version=0.9.15
+version=0.10.1
 revision=1
 build_style="gnu-configure"
 configure_args="--with-opensp-includes=${XBPS_CROSS_BASE}/usr/include/OpenSP
  --with-opensp-libs=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
 makedepends="opensp-devel libcurl-devel libxml++-devel"
-short_desc="Parser and an API designed to allow applications to very easily support OFX command responses"
+short_desc="OFX banking protocol abstraction library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://libofx.sourceforge.net"
+changelog="https://raw.githubusercontent.com/libofx/libofx/master/NEWS"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname/$pkgname-$version.tar.gz"
-checksum=e95c14e09fc37b331af3ef4ef7bea29eb8564a06982959fbd4bca7e331816144
+checksum=3bcc2c86b23dc11315a8ce0c9f20cc504fdc6147ea3a0385cb3e05768279c64d
 
 libofx-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 1dfc2da9bb1cacafcb0bd5b2667b451a0d250a08 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 10:58:11 +1100
Subject: [PATCH 0198/2024] homebank: revbump for libofx

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

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 707ae59fb402..c92efe7057be 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.5.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"

From e019ba37ad24ff6fe678dbc1beaea10628ac2c97 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 11:28:26 +1100
Subject: [PATCH 0199/2024] kmymoney: revbump for libofx

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

diff --git a/srcpkgs/kmymoney/template b/srcpkgs/kmymoney/template
index f6408a55ca9d..9ed8942e2886 100644
--- a/srcpkgs/kmymoney/template
+++ b/srcpkgs/kmymoney/template
@@ -1,7 +1,7 @@
 # Template file for 'kmymoney'
 pkgname=kmymoney
 version=5.1.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DBUILD_TESTING=OFF"

From 1b4834ef05ba7fbbafc4bd77e6a74e4dfa690ace Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 12:02:42 +1100
Subject: [PATCH 0200/2024] gnucash: revbump for libofx

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

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

From 73e50497d85dad2160bc678251654ab0213c983a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 31 Mar 2021 01:36:37 +0300
Subject: [PATCH 0201/2024] qbittorrent: update to 4.3.4.1.

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

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 2598ea2d282e..85519461d8a3 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.3
-revision=2
+version=4.3.4.1
+revision=1
 create_wrksrc=yes
 build_style=gnu-configure
 build_helper=qmake
@@ -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=5966fdceab877fa3fedd9776a5f8ec6ce55308048e1d4a16b819d9b650dbc137
+checksum=4bb87bed614dcfbaeb07f70d90b4e09c628aacad4a1ea7972cd2d77ed8c320f1
 
 do_extract() {
 	local n=${pkgname}-${version}

From c58f854a8fb7b59a81056c109366287c62468fd2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 Mar 2021 10:24:14 +0200
Subject: [PATCH 0202/2024] platformio: update to 5.1.1.

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

diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template
index e4ea76674913..f338639c7d3a 100644
--- a/srcpkgs/platformio/template
+++ b/srcpkgs/platformio/template
@@ -1,6 +1,6 @@
 # Template file for 'platformio'
 pkgname=platformio
-version=5.1.0
+version=5.1.1
 revision=1
 wrksrc="platformio-core-${version}"
 build_style=python3-module
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/platformio/platformio-core"
 changelog="https://raw.githubusercontent.com/platformio/platformio-core/develop/HISTORY.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=3579411f44f490282be3eba552a672bd8afe8d7198faefca25a3c5e0d19d34b7
+checksum=f312c4cb535dc52c96b754cb54df3fee8001ab960894c7f2f9edd0e50d416aed
 
 post_install() {
 	vinstall scripts/99-platformio-udev.rules 644 usr/lib/udev/rules.d

From 930b7cf84308bf97f14ac17b7828c7b7ea6aedf1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 31 Mar 2021 10:25:47 +0200
Subject: [PATCH 0203/2024] youtube-dl: update to 2021.03.31.

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

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 5eb18e91531f..01d2840fc399 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2021.03.25
+version=2021.03.31
 revision=1
 wrksrc="${pkgname}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://yt-dl.org"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="${homepage}/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=a303cfd327938e3f15890099be79958cc17d536d1f985301d5462e487af3485f
+checksum=f215d0e297febca0552e309dba12d62c53a56ed138de314d63b7fb80617e6ceb
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 8f43efb84eb6db9133dfa238dac90be34f8da44d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Mar 2021 13:25:56 +0200
Subject: [PATCH 0204/2024] netpbm: update to 10.94.01.

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

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index cdbf0c34dcca..6c7c6e388dab 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.93.03
+version=10.94.01
 revision=1
-_githash=a7fca291a0c78333da13e855bdb73aa819ba8649
-_githash_guide=db21e5ffa2830350c67547e3007c891ed75d9dac
+_githash=dd12f603fa64ee403e4fa351eb1e95a27b26b599
+_githash_guide=2d01412ab83361b8ed8d8db8f364cb223bd1c152
 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="789514f480f6b487eb9274b9f1fe94d950ba48755792b42c85e41aa4bb1ef572
- 01210c2019b9131bcbbe0cec8759423b7b7018e6c8acba7b48cca3356758c96f"
+checksum="c84c8a0e4d9b3c7d3e05d6ba2becb9afb75bbbe6be2f20e6037847e18c352d71
+ 794cf365b1c3b6b9b2f9536b8b173ccbcbc74a96cf6eaa4377aa4a684af4ad58"
 
 post_extract() {
 	cd $build_wrksrc
@@ -26,7 +26,6 @@ post_extract() {
 	done
 
 	cd ../netpbm-mirror-${_githash_guide}
-	vsed -i 's/ id="pammixmulti"//g' pammixmulti.html
 	vsed -i 's/ id="pamhomography"//g' pamhomography.html
 }
 

From 0932719f72f7898b1b03d6198007e397f7d0088a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Mar 2021 13:27:59 +0200
Subject: [PATCH 0205/2024] perl-Data-Validate-IP: update to 0.30.

---
 srcpkgs/perl-Data-Validate-IP/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Data-Validate-IP/template b/srcpkgs/perl-Data-Validate-IP/template
index c2b2e143ffd5..2f80276a530b 100644
--- a/srcpkgs/perl-Data-Validate-IP/template
+++ b/srcpkgs/perl-Data-Validate-IP/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Data-Validate-IP'
 pkgname=perl-Data-Validate-IP
-version=0.27
-revision=2
+version=0.30
+revision=1
 wrksrc="Data-Validate-IP-$version"
 build_style=perl-module
 hostmakedepends="perl perl-NetAddr-IP"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://metacpan.org/release/Data-Validate-IP"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 distfiles="${CPAN_SITE}/Data/Data-Validate-IP-${version}.tar.gz"
-checksum=e1aa92235dcb9c6fd9b6c8cda184d1af73537cc77f4f83a0f88207a8bfbfb7d6
+checksum=fe2f7663e18b70d5510529c22f45fdd2bbdb4a5adb26d65c9050c5b9696e8a1c

From 9fc95401936a8bbe8cbc40b0d82ff160824fbf76 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Mar 2021 13:54:50 +0200
Subject: [PATCH 0206/2024] python3-pwntools: update to 4.4.0.

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

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index 3e7c5b9bbd74..e55396f0b064 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pwntools'
 pkgname=python3-pwntools
-version=4.3.1
+version=4.4.0
 revision=1
 wrksrc="pwntools-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
-checksum=c46188e713c47617b2dbf3e32d1867f948d35d82fddf9a9d2294a33f47484a8a
+checksum=c51605b538c6394c6c31bc90bb3436224b497be1fe21a0a2420785ca399087e3
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From e30add32bdabefff4a5bedbf050e3c45e7fb5c36 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Mar 2021 13:58:10 +0200
Subject: [PATCH 0207/2024] curl: update to 7.76.0.

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

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 48a5fa405969..ef608fb425f6 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.75.0
-revision=2
+version=7.76.0
+revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -21,7 +21,7 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026
+checksum=e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a
 patch_args="-Np1"
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"

From 503d55018343ed9510ef244607863a90590b42b6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 31 Mar 2021 09:38:23 -0500
Subject: [PATCH 0208/2024] libxlsxwriter: update to 1.0.1.

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

diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 39dbc09566d0..62b799d41418 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.0
+version=1.0.1
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=8b353379333c323d14a9d265cd2491d3a6c0032c8d6ec2141f10b82ab66a087c
+checksum=86df82e1180f07bd0be19225776db8fbe199d66e715a343d8c0c3444b05ec00b
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From 03be01e2c2d90133f1b527904419ad9a7d5f5c18 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Mar 2021 17:35:22 +0200
Subject: [PATCH 0209/2024] ipe: update to 7.2.23.

---
 srcpkgs/ipe/template | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index 7d2b67f8fafc..af22b4c8bcb5 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,33 +1,34 @@
 # Template file for 'ipe'
 pkgname=ipe
-version=7.2.22
+version=7.2.23
 revision=1
 _tools_commit=v7.2.20.1
 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
 makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
- lua53-devel poppler-devel qt5-devel"
+ lua53-devel poppler-devel qt5-devel libspiro-devel"
 short_desc="Drawing editor for creating figures in PDF or EPS formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://ipe.otfried.org/"
 distfiles="https://dl.bintray.com/otfried/generic/ipe/${version%.*}/ipe-${version}-src.tar.gz
  https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz"
-checksum="25a6e5194de9183296107ddeff8cbb34c49aad35255bc22c2f9b5ccaf1e15830
+checksum="a19ba29822e63fc7c12c3b85ca5bb58f9ee72fdf566e148af79206b5dc1f757b
  233f5629986ade3d70de6dd1af85d578d6aa0f92f9bcd1ecd4e8e5a94b508376"
 nocross="something with gsl"
 
 post_extract() {
 	mv $XBPS_BUILDDIR/ipe-tools* ipe-tools
 
-	sed -i 's/xlocale.h/locale.h/g' src/ipelib/ipeplatform.cpp
-	sed -i '/cstdio/i#include <sys/types.h>' src/include/ipebase.h
-	sed -i '/cstdio/i#include <limits.h>' src/include/ipebase.h
+	vsed -i 's/xlocale.h/locale.h/g' src/ipelib/ipeplatform.cpp
+	vsed -i '/cstdio/i#include <sys/types.h>' src/include/ipebase.h
+	vsed -i '/cstdio/i#include <limits.h>' src/include/ipebase.h
 }
 
 do_build() {
-	make ${makejobs} -C src IPEPREFIX=/usr LUA_PACKAGE=lua5.3 CXX="$CXX" CXXFLAGS="$CXXFLAGS" MOC=moc-qt5
-	make ${makejobs} -C ipe-tools/figtoipe CXX="$CXX" CXXFLAGS="$CXXFLAGS"
-	make ${makejobs} -C ipe-tools/pdftoipe CXX="$CXX" CXXFLAGS="$CXXFLAGS"
+	export CXX CXXFLAGS
+	make ${makejobs} -k -C src IPEPREFIX=/usr LUA_PACKAGE=lua5.3 -k
+	make ${makejobs} -k -C ipe-tools/figtoipe
+	make ${makejobs} -k -C ipe-tools/pdftoipe
 }
 
 do_install() {

From 8cff9d2b70b626597cd51e46af195ecb4774a69e Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>
Date: Thu, 25 Mar 2021 17:21:30 -0400
Subject: [PATCH 0210/2024] julia: update to 1.6.0.

---
 srcpkgs/julia/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 56eb8f9511d1..4df23ca8ac23 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,38 +1,39 @@
 # Template file for 'julia'
 pkgname=julia
-version=1.5.3
-revision=2
+version=1.6.0
+revision=1
 archs="i686* x86_64* armv7l* aarch64*"
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share
  USE_BINARYBUILDER=0 USE_SYSTEM_LIBM=0 USE_SYSTEM_DSFMT=0 USE_SYSTEM_LIBUV=0
  USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_BLAS=0 USE_SYSTEM_LAPACK=0 USE_SYSTEM_LLVM=1
  USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_GMP=1 USE_SYSTEM_PATCHELF=1
- USE_SYSTEM_MPFR=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_CURL=1
- USE_SYSTEM_ZLIB=1 USE_SYSTEM_P7ZIP=1 USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_UTF8PROC=1
+ USE_SYSTEM_MPFR=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_NGHTTP2=1
+ USE_SYSTEM_CURL=1 USE_SYSTEM_ZLIB=1 USE_SYSTEM_P7ZIP=1 USE_SYSTEM_LIBGIT2=1
+ USE_SYSTEM_UTF8PROC=1
  UTF8PROC_INC='${XBPS_CROSS_BASE}/usr/include/libutf8proc'"
 make_install_args="$make_build_args"
 make_check_args="$make_build_args"
 make_check_target=testall
 conf_files="/etc/julia/startup.jl"
 hostmakedepends="pkg-config perl cmake python gcc-fortran patchelf which tar xz"
-makedepends="p7zip pcre2-devel mpfr-devel libgit2-devel libcurl-devel
+makedepends="p7zip pcre2-devel mpfr-devel libgit2-devel libcurl-devel nghttp2-devel
  libssh2-devel mbedtls-devel libatomic-devel zlib-devel libunwind-devel
- libutf8proc-devel llvm10"
+ libutf8proc-devel llvm11"
 # Julia provides vendored symlinks in /usr/lib/julia pointing to these libraries,
 # but none of the julia executables link to them so these are not auto-detected
-depends="libgit2 libcurl mpfr mbedtls libpcre2 libssh2 libquadmath p7zip"
+depends="libgit2 libcurl mpfr mbedtls libatomic libpcre2 libssh2 nghttp2 libquadmath libssp p7zip"
 short_desc="High-level, high-performance dynamic programming language"
 maintainer="Adam Beckmeyer <adam_git@thebeckmeyers.xyz>"
 license="MIT"
 homepage="https://julialang.org"
 distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"
-checksum=fb69337ca037576758547c7eed9ae8f153a9c052318327b6b7f1917408c14d91
+checksum=1b05f42c9368bc2349c47363b7ddc175a2da3cd162d52b6e24c4f5d4d6e1232c
 nocross="build system is a mess"
 # Targets for the vendored symlinks mentioned above
 shlib_requires="libgit2.so.1.0 libcurl.so.4 libmpfr.so.6 libgmp.so.10
  libmbedcrypto.so.3 libmbedtls.so.12 libmbedx509.so.0 libpcre2-8.so.0
- libssh2.so.1 libquadmath.so.0"
+ libssh2.so.1 libquadmath.so.0 libnghttp2.so.14 libatomic.so.1 libssp.so.0"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*)
@@ -85,8 +86,8 @@ post_install() {
 
 	# julia needlessly copies system libraries into a vendor directory
 	local _lib
-	for _lib in libgcc_s.so.1 libgfortran.so.5 libquadmath.so.0; do
-		rm -f "${DESTDIR}/usr/lib/julia/${_lib}"
+	for _lib in libgcc_s.so.1 libgfortran.so.5 libquadmath.so.0 libatomic.so.1 libstdc++.so.6 libssp.so.0; do
+		rm "${DESTDIR}/usr/lib/julia/${_lib}"
 		ln -s "/usr/lib/${_lib}" "${DESTDIR}/usr/lib/julia"
 	done
 }

From 8630aa8b0249cd1c7d006a0e2a69ec70c6cf2646 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 31 Mar 2021 21:07:27 +0300
Subject: [PATCH 0211/2024] font-sarasa-gothic: update to 0.20.2

---
 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 01c2a07202d2..b65ac762e51e 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.20.0
+version=0.20.2
 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=d71a0fc07665a81bd94bbd6d4063f3141f56a78a1dea536886ecb029f34338f0
+checksum=8d29448e685fdc56b824133d51c295bbc5056c40ff6c624927f45032472f8be1
 
 font_dirs="/usr/share/fonts/TTF"
 

From 15c023acc4c7a8c261e84965b8faa6a6ac9b657c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Wed, 31 Mar 2021 18:14:47 +0200
Subject: [PATCH 0212/2024] AusweisApp2: update to 1.22.2.

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

diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 2264126b3524..5ee22fec995c 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,6 +1,6 @@
 # Template file for 'AusweisApp2'
 pkgname=AusweisApp2
-version=1.22.1
+version=1.22.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -12,4 +12,4 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="EUPL-1.2"
 homepage="https://www.ausweisapp.bund.de/ausweisapp2/"
 distfiles="https://github.com/Governikus/AusweisApp2/archive/refs/tags/${version}.tar.gz"
-checksum=8bae7d4fcb03d1ab247bc7b35e55c5d4dfd98f017c121947652e16c29ae6049d
+checksum=79d637a976dc1dc5445757a43324f4fe609d844bf90f11c0f62a46c39dc4fea6

From 2b11f20dbd5782b9f5cf11d74edc8f138034d8e8 Mon Sep 17 00:00:00 2001
From: Florian Warzecha <liketechnik@disroot.org>
Date: Wed, 31 Mar 2021 11:05:43 +0200
Subject: [PATCH 0213/2024] New package: ldacBT-2.0.2.3

---
 common/shlibs           |  2 ++
 srcpkgs/ldacBT-devel    |  1 +
 srcpkgs/ldacBT/template | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 120000 srcpkgs/ldacBT-devel
 create mode 100644 srcpkgs/ldacBT/template

diff --git a/common/shlibs b/common/shlibs
index 4a81ffd64e21..0f3cd7161b1b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3971,3 +3971,5 @@ libwayland-egl++.so.0 libwaylandpp-0.2.8_1
 libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
 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
diff --git a/srcpkgs/ldacBT-devel b/srcpkgs/ldacBT-devel
new file mode 120000
index 000000000000..8b2b5d4a4036
--- /dev/null
+++ b/srcpkgs/ldacBT-devel
@@ -0,0 +1 @@
+ldacBT
\ No newline at end of file
diff --git a/srcpkgs/ldacBT/template b/srcpkgs/ldacBT/template
new file mode 100644
index 000000000000..9d31ff7a8721
--- /dev/null
+++ b/srcpkgs/ldacBT/template
@@ -0,0 +1,22 @@
+# Template file for 'ldacBT'
+pkgname=ldacBT
+version=2.0.2.3
+revision=1
+wrksrc=ldacBT
+build_style=cmake
+short_desc="LDAC Bluetooth encoder library"
+maintainer="Florian Warzecha <liketechnik@disroot.org>"
+license="Apache-2.0"
+homepage="https://github.com/EHfive/ldacBT"
+distfiles="https://github.com/EHfive/ldacBT/releases/download/v${version}/ldacBT-${version}.tar.gz"
+checksum="4bd8eece78bb5c1361fab95743e7100506e2408a25c4a592a0f8d349746dc5b4"
+
+ldacBT-devel_package() {
+	depends="ldacBT>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 260a48def3ce427a3bd6bec86459b7a9a0abe554 Mon Sep 17 00:00:00 2001
From: Florian Warzecha <liketechnik@disroot.org>
Date: Wed, 31 Mar 2021 11:15:59 +0200
Subject: [PATCH 0214/2024] pipewire: add support for ldac

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

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 171ea2d0d4c7..9c64ff428054 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,16 +1,15 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.24
-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
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-# LDAC support can be enabled when ldacbt is packaged
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
- libopenaptx-devel fdk-aac-devel"
+ libopenaptx-devel fdk-aac-devel ldacBT-devel"
 depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"

From 4fb9308b3e8a2eb4158d0503c1c59cc6c3469b03 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:57:59 -0700
Subject: [PATCH 0215/2024] fdk-aac: fix license

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

diff --git a/srcpkgs/fdk-aac/template b/srcpkgs/fdk-aac/template
index 05db31c4647a..a9f858050c93 100644
--- a/srcpkgs/fdk-aac/template
+++ b/srcpkgs/fdk-aac/template
@@ -1,11 +1,11 @@
 # Template file for 'fdk-aac'
 pkgname=fdk-aac
 version=2.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Fraunhofer FDK AAC codec library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Fraunhofer FDK AAC Codec license"
+license="custom:Fraunhofer FDK AAC Codec license"
 homepage="http://www.iis.fraunhofer.de/en/ff/amm/impl/fdkaaccodec.html"
 distfiles="${SOURCEFORGE_SITE}/opencore-amr/${pkgname}-${version}.tar.gz"
 checksum=840133aa9412153894af03b27b03dde1188772442c316a4ce2a24ed70093f271

From 406114b2ba7082c41cecbd75afde6ff6783592ee Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 31 Mar 2021 10:38:27 +0200
Subject: [PATCH 0216/2024] jj: update to 1.7.4.

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

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index c05dc5e436d5..1c2666174acb 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,17 +1,16 @@
 # Template file for 'jj'
 pkgname=jj
-version=1.2.3
+version=1.7.4
 revision=1
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"
-hostmakedepends="git"
 short_desc="JSON Stream Editor"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/tidwall/jj"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ec234050d032705d9353941e4210ee632317c079c6289f8c8f20c803d35929f0
+checksum=47c51b528754b5e3bea47024ff0b13d1141ee9dab0b8216f6e2472f9c0d83989
 
 post_install() {
 	vlicense LICENSE

From 70a79d48064289ad3e01bce8af1f774b6ded2c95 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 30 Mar 2021 16:14:58 +0200
Subject: [PATCH 0217/2024] dhewm3: update to 1.5.1.

---
 .../patches/musl-temp_failure_retry.patch     |  2 +-
 srcpkgs/dhewm3/patches/ppc64.patch            | 26 -------------------
 srcpkgs/dhewm3/template                       | 10 +++----
 3 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/dhewm3/patches/ppc64.patch

diff --git a/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch b/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch
index 0954b6527256..c31a74af3e89 100644
--- a/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch
+++ b/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch
@@ -15,4 +15,4 @@
 +
  idPort clientPort, serverPort;
  
- idCVar net_ip( "net_ip", "localhost", CVAR_SYSTEM, "local IP address" );
+ IDcVar net_ip( "net_ip", "localhost", CVAR_SYSTEM, "local IP address" );
diff --git a/srcpkgs/dhewm3/patches/ppc64.patch b/srcpkgs/dhewm3/patches/ppc64.patch
deleted file mode 100644
index 087cb3973d55..000000000000
--- a/srcpkgs/dhewm3/patches/ppc64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fixes build as the altivec bits include a MacOS-specific header.
-
-Original author: <frediz@linux.vnet.ibm.com>
-
---- neo/idlib/math/Simd_AltiVec.cpp	2017-07-12 12:34:33.000000000 +0000
-+++ neo/idlib/math/Simd_AltiVec.cpp	2017-07-12 12:43:51.863029647 +0000
-@@ -45,7 +45,7 @@
- //
- //===============================================================
- 
--#if defined(__GNUC__) && defined(__ALTIVEC__)
-+#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
- 
- #ifdef PPC_INTRINSICS
- 	// for square root estimate instruction
---- neo/idlib/math/Simd_AltiVec.h	2017-07-12 12:34:33.000000000 +0000
-+++ neo/idlib/math/Simd_AltiVec.h	2017-07-12 12:38:38.083750262 +0000
-@@ -110,7 +110,7 @@
- //#define DRAWVERT_PADDED
- 
- class idSIMD_AltiVec : public idSIMD_Generic {
--#if defined(__GNUC__) && defined(__ALTIVEC__)
-+#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
- public:
- 
- 	virtual const char * VPCALL GetName( void ) const;
diff --git a/srcpkgs/dhewm3/template b/srcpkgs/dhewm3/template
index 5d94c096afe6..5509900e8c0b 100644
--- a/srcpkgs/dhewm3/template
+++ b/srcpkgs/dhewm3/template
@@ -1,6 +1,6 @@
 # Template file for 'dhewm3'
 pkgname=dhewm3
-version=1.5.0
+version=1.5.1
 revision=1
 build_wrksrc="neo"
 build_style=cmake
@@ -9,9 +9,5 @@ short_desc="Doom 3 GPL source port"
 maintainer="John Rowley <enterthevoid@codesector.co>"
 license="GPL-3.0-or-later"
 homepage="https://dhewm3.org/"
-distfiles="https://github.com/dhewm/dhewm3/archive/${version}.tar.gz"
-checksum=fd299c8a2db1ecde15f861e4a883a5d61e5da0c74e26f89fb50b52b978fe8212
-
-case "$XBPS_TARGET_MACHINE" in
-	arm*) makedepends+=" libX11-devel";;
-esac
+distfiles="https://github.com/dhewm/dhewm3/releases/download/${version}/dhewm3-${version}-src.tar.xz"
+checksum=31671f35fb6f83272dfa2a27c0dad6183bc228f1f1a448ef925052cf4dcf4b68

From ba1dd2a7c01a7991febd709af40a07cf4cba023e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 Mar 2021 15:30:41 -0400
Subject: [PATCH 0218/2024] julia: broken on i686*

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

diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 4df23ca8ac23..6ff8671036c7 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -43,6 +43,7 @@ i686*)
 	export LDFLAGS="-Wl,--no-keep-memory"
 
 	make_build_args+=" MARCH=pentium4 OPENBLAS_USE_THREAD=0"
+	broken="https://build.voidlinux.org/builders/i686_builder/builds/31520/steps/shell_3/logs/stdio"
 	;;
 x86_64*)
 	export M="x86-64"

From edf50ef0ca6323ac54e7c90661d72a03f07dcc93 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 31 Mar 2021 22:03:17 +0200
Subject: [PATCH 0219/2024] gsfonts: fix distfile

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

diff --git a/srcpkgs/gsfonts/template b/srcpkgs/gsfonts/template
index 7bffdafc025c..b7e31cfd441f 100644
--- a/srcpkgs/gsfonts/template
+++ b/srcpkgs/gsfonts/template
@@ -1,7 +1,7 @@
 # Template file for 'gsfonts'
 pkgname=gsfonts
 version=8.11
-revision=6
+revision=7
 wrksrc=fonts
 makedepends="font-util font-misc-misc"
 depends="${makedepends}"
@@ -10,6 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/gs-fonts/"
 distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/gs-fonts/ghostscript-fonts-std-${version}.tar.gz"
 checksum=0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401
 font_dirs="/usr/share/fonts/Type1"
 

From 47f3b8ee1fdf4f28eeb10f3bf69e3212af566d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 31 Mar 2021 21:21:56 +0200
Subject: [PATCH 0220/2024] qtcreator: update to 4.14.2, adopt.

---
 srcpkgs/qtcreator/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 6080b0da508b..d98e49cb4e4c 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=4.14.1
+version=4.14.2
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
@@ -11,11 +11,11 @@ makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
  qt5-quickcontrols clang llvm"
 depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
 short_desc="Cross-platform IDE for Qt developers"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=ef6fdcbaebb0d3d37cfdbc68f8b9e94ffeb6f63194564da5ce77760bb7790367
+checksum=bd2bb62474f07466d8b59b0f751f29064deea3ed56173bce82548cb80e2d1a29
 replaces="qtcreator-data>=0"
 python_version=3
 
@@ -43,13 +43,14 @@ qtcreator-full_package() {
 	short_desc+=" - full Qt5 dependencies"
 	depends="${sourcepkg}>=${version}_${revision} base-devel
  qt5-3d-devel qt5-charts-devel qt5-connectivity-devel qt5-datavis3d-devel
- qt5-declarative-devel qt5-datavis3d-devel qt5-gamepad-devel qt5-location-devel
+ qt5-declarative-devel qt5-gamepad-devel qt5-location-devel qt5-lottie-devel
  qt5-multimedia-devel qt5-networkauth-devel qt5-purchasing-devel qt5-quickcontrols
  qt5-quickcontrols2-devel qt5-remoteobjects-devel qt5-script-devel qt5-scxml-devel
- qt5-sensors-devel qt5-serialbus-devel qt5-serialport-devel qt5-speech-devel qt5-svg-devel
+ qt5-sensors-devel qt5-serialbus-devel qt5-serialport-devel
+ qt5-speech-devel qt5-styleplugins-devel qt5-svg-devel
  qt5-tools-devel qt5-virtualkeyboard-devel qt5-wayland-devel qt5-webchannel-devel
  qt5-webglplugin-devel qt5-webkit-devel qt5-websockets-devel qt5-webview-devel
- qt5-x11extras-devel qt5-xmlpatterns-devel qt5-tools-devel qt5-host-tools
+ qt5-x11extras-devel qt5-xmlpatterns-devel qt5-host-tools
  qt5-examples qt5-imageformats qt5-graphicaleffects qt5-translations
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
 	# Not for big endian targets and not if word sizes of host and target differ

From 5988b52826ea235820477b44529dafe34f77d9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 31 Mar 2021 23:52:12 +0200
Subject: [PATCH 0221/2024] youtube-dl: update to 2021.04.01.

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

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 01d2840fc399..de8650f38273 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2021.03.31
+version=2021.04.01
 revision=1
 wrksrc="${pkgname}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://yt-dl.org"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="${homepage}/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=f215d0e297febca0552e309dba12d62c53a56ed138de314d63b7fb80617e6ceb
+checksum=f098ef95933a33096f60cb8c3bfbde710f6f84c9cad1b093082584bdc4a089ef
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From e13ee987301345de58536ed01c737e6791b5e264 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 1 Apr 2021 00:28:18 +0200
Subject: [PATCH 0222/2024] rclone: update to 1.55.0.

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

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 849afadf336c..65240e5cf4b3 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,6 +1,6 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.54.1
+version=1.55.0
 revision=1
 wrksrc="rclone-v${version}"
 build_style=go
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://rclone.org/"
 changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/changelog.md"
 distfiles="https://downloads.rclone.org/v${version}/rclone-v${version}.tar.gz"
-checksum=378a4fd9f3fc47d51413ba48e31a275c972a9e31f3483d46c196ab26f8f1d7e7
+checksum=75accdaedad3b82edc185dc8824a19a59c30dc6392de7074b6cd98d1dc2c9040
 
 pre_build() {
 	if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then

From 9da067e085c666be5d7fcd8bd4c7f9fb879e28b9 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 1 Apr 2021 00:17:12 +0200
Subject: [PATCH 0223/2024] lagrange: update to 1.3.0.

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

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 97dea0e2bc0a..8cd5cf544086 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.2.2
+version=1.3.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,7 +11,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=66f7d06359c8d2de72787b02062d9bf4190a8667b6dd00b329b9bb6549bdac55
+checksum=5737ae2d16779e8a0f1cb27b18a22ebba7dffb5e11f1d189c27441bed11b08e0
 
 post_install() {
 	vlicense LICENSE.md

From f0abd169389d9e922db70b3c665e33be7599f07b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 1 Apr 2021 07:45:47 +0200
Subject: [PATCH 0224/2024] linux5.4: update to 5.4.109.

---
 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 5a37176c78d9..cd1fdb657f2e 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.108
+version=5.4.109
 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=f212ac07c21bd33e6898fdbb2ddba2a454f74578bbe7bef8fe4dbbbc0ec52172
+checksum=ac6af4562717d030266fcddb0a3c44598610ca8c9c3a654725f58b9cbd61b7ee
 python_version=3
 patch_args="-Np1"
 

From 8229671658c8552b330ff40c981ab28b355aa4cd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 1 Apr 2021 07:48:49 +0200
Subject: [PATCH 0225/2024] linux4.19: update to 4.19.184.

---
 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 b569fe000864..1fd96d526eaa 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.183
+version=4.19.184
 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=bacfd95ddf51df70b2962fc685b5217fc449e644f16996e49d87eb259b84a5f5
+checksum=3dfaf6aae242cb4165d2c0df3405558264f86c3b04f7bbef71b99c83a87ab77c
 python_version=2 #unverified
 patch_args="-Np1"
 

From 005ed816105b384e748c29f585c1c06d4f30ee3a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 1 Apr 2021 13:08:01 +0200
Subject: [PATCH 0226/2024] libfido2: update to 1.7.0.

---
 srcpkgs/libfido2/template | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index a329477e1190..0acf10bfc219 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,30 +1,23 @@
 # Template file for 'libfido2'
 pkgname=libfido2
-version=1.6.0
-revision=2
+version=1.7.0
+revision=1
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
+makedepends="eudev-libudev-devel libcbor-devel openssl-devel zlib-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/Yubico/libfido2"
 distfiles="https://github.com/Yubico/libfido2/archive/${version}.tar.gz"
-checksum=6aed47aafd22be49c38f9281fb88ccd08c98678d9b8c39cdc87d1bb3ea2c63e4
+checksum=116749b2a6c95f6559439494fcebdbe803dff14037017ad239843c84c59d708e
 # udev rules used to be shipped by libu2f-host
 conf_files="/usr/lib/udev/rules.d/70-u2f.rules"
 conflicts="libu2f-host<=1.1.10_3"
 
-CFLAGS="-Wno-type-limits"
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	# ioctl takes int on musl
-	CFLAGS+=" -Wno-overflow"
-fi
-
-pre_configure() {
-	vsed -i -e "s;sign-conversion;no-sign-conversion;" \
-		{tools,src,examples}/CMakeLists.txt
+post_extract() {
+	vsed -i -e '/add_compile_options(-Werror)/d' CMakeLists.txt
 }
 
 post_install() {

From 25a2d3af0e7104cd8092440a759a13b2bfc1fae8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 14:50:06 +0300
Subject: [PATCH 0227/2024] font-Hasklig: update to 1.2, - remove unzip from
 hostmakedepends as bsdtar handles the zip distfile, - fix the distfile url, -
 add changelog, - install correctly and only the OTF fonts, - adopt the
 template.

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

diff --git a/srcpkgs/font-Hasklig/template b/srcpkgs/font-Hasklig/template
index 82872213ef49..b65c065d17b1 100644
--- a/srcpkgs/font-Hasklig/template
+++ b/srcpkgs/font-Hasklig/template
@@ -1,20 +1,20 @@
 # Template file for 'font-Hasklig'
 pkgname=font-Hasklig
-version=1.1
-revision=2
+version=1.2
+revision=1
 create_wrksrc=yes
-hostmakedepends="unzip"
 depends="font-util xbps-triggers"
 short_desc="Monospaced font with ligatures"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://github.com/i-tu/Hasklig/"
-distfiles="https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"
-checksum=98eccec22bc0ae3838a099a911230f62197e681b6a6c30e5149c52f5fc6a95c3
+changelog="https://raw.githubusercontent.com/i-tu/Hasklig/main/CHANGELOG.md"
+distfiles="https://github.com/i-tu/Hasklig/releases/download/v${version}/Hasklig-${version}.zip"
+checksum=9cd35a7449b220dc84f9516c57817e147003fc905a477f1ec727816d9d8a81d4
 
 font_dirs="/usr/share/fonts/OTF"
 
 do_install() {
 	vmkdir usr/share/fonts/OTF
-	vcopy "*" usr/share/fonts/OTF
+	vcopy "OTF/*" usr/share/fonts/OTF
 }

From 4e612adf1f6eb4e565e60039016938c548b82a43 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 1 Apr 2021 12:54:36 +0200
Subject: [PATCH 0228/2024] python3-pikepdf: update to 2.10.0.

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

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 63fc9ecdb591..79b00fa25b28 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.9.2
+version=2.10.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=7dd6bad55da7b41b37f678058fa586b73d9052f46aa0ba78ad7b1bc61e854088
+checksum=7a804515942049f846d548d3b817317f8136e06938737ff64b79c82d61908e27
 
 pre_build() {
 	vsed -i "s/__version__.*/__version__ = '${version}'/g" setup.py

From dce09233e27959212a78b7361df3235848fc2acf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 13:06:20 +0300
Subject: [PATCH 0229/2024] qownnotes: update to 21.3.0.

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

diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index 6b6744b76870..566a18a022ae 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
 # Template file for 'qownnotes'
 pkgname=qownnotes
-version=20.12.0
+version=21.3.0
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="https://www.qownnotes.org"
 changelog="https://www.qownnotes.org/changelog/QOwnNotes"
 distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=c21352a876fb3cb6cb58fb05536f78ab061b79fec8ced055ff7c9a285674898d
+checksum=6efa2629fa27719f1d99c95636e20ae93ff08cfa4c5a89ec16c083ba6e6c8dec
 
 pre_build() {
 	sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri

From 3dba262ed26e1d247f018afc64734789b50891c7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 12:13:08 +0300
Subject: [PATCH 0230/2024] Thunar: update to 4.16.6.

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

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 67d042861f61..a3b6c1de8a80 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,7 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 reverts="4.17.0_1"
-version=4.16.5
+version=4.16.6
 revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=ec077293b1fb291fe12658b4fe6b92c924126dc6527f426516011ddf5ee56d47
+checksum=cb531d3fe67196a43ca04979ef271ece7858bbc80c15b0ee4323c1252a1a02b7
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 72ba133e284ff1e7890bde604add88b9f8935cb4 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 11:31:53 +0200
Subject: [PATCH 0231/2024] gumbo-parser: depend -devel package on the base and
 fixes

- Installing gumbo-parser-devel didn't provide .so files,
  because they are in the base package, so packages depending on
  this library used the static one instead.

- add libgumbo to shlibs

- fix checks

- remove starting an article
---
 common/shlibs                 | 1 +
 srcpkgs/gumbo-parser/template | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 0f3cd7161b1b..9cc5873cdaed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3973,3 +3973,4 @@ 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
+libgumbo.so.1 gumbo-parser-0.10.1_2
diff --git a/srcpkgs/gumbo-parser/template b/srcpkgs/gumbo-parser/template
index 40daed6dbdda..db546f7640f1 100644
--- a/srcpkgs/gumbo-parser/template
+++ b/srcpkgs/gumbo-parser/template
@@ -4,7 +4,8 @@ version=0.10.1
 revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool"
-short_desc="An HTML5 parsing library in pure C99"
+checkdepends="gtest-devel"
+short_desc="HTML5 parsing library in pure C99"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="Apache-2.0"
 homepage="https://github.com/google/gumbo-parser"
@@ -19,6 +20,7 @@ pre_configure() {
 
 gumbo-parser-devel_package() {
 	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From 29665edcea50e2460d5997c914056a1d50a9fe54 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 11:56:07 +0200
Subject: [PATCH 0232/2024] httpdirfs: revbump for gumbo-parser and remove
 depends

Libraries are detected automatically by xbps-src anyway.
---
 srcpkgs/httpdirfs/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index cbff9e7ae259..642e893c0435 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,12 +1,11 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=3
+revision=4
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel
  libuuid-devel expat-devel"
-depends="libcurl fuse gumbo-parser"
 short_desc="Mount HTTP directory listings, with a permanent cache"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-3.0-only"

From 5f1fd2f8b64d2735a74c263cbf7084da40ac471d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 11:51:55 +0300
Subject: [PATCH 0233/2024] xfce4-battery-plugin: update to 1.1.4.

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

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index cb06f004f219..d370cb980aad 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
-version=1.1.3
-revision=3
+version=1.1.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=12be0a44d16bd1e1618513ee64f946814925872db7d1c1188ab1454b00d040a3
+checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222

From defeaf5d5591ed4e4d8ff8dff169f71bb76c517a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 11:56:43 +0300
Subject: [PATCH 0234/2024] xfce4-systemload-plugin: update to 1.3.1.

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

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e05885f61210..e3d299fcf39d 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=1148f8e90cc53cae9b3aa32e10df4bd9fdc2f06db09d8429f88fbdd874fc171d
+checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
 	vlicense COPYING

From db481ee9e68c29c4b7851e36fbda9cdf93de740b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 12:04:02 +0300
Subject: [PATCH 0235/2024] xfce4-cpufreq-plugin: update to 1.2.5.

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

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 713aa0da6660..4cac5e32a7a0 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
-version=1.2.4
+version=1.2.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=815218b53f8cab554b532e6686d63f38817c6e01e04d7d1599cbe26e4af07f9e
+checksum=f8bd728de2d33e7ab30c682716b1cac4776b9884ce48b03fd7c32c9b24b13498

From 274d729e994adca481c7c4cbcdc0a5fd9d8a4e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 31 Mar 2021 17:00:18 +0200
Subject: [PATCH 0236/2024] intellij-idea-ultimate-edition: update to 2020.3.3.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 826338dbd83a..177b6e669cb3 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=2020.3.2
+version=2020.3.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-203.7148.57"
+wrksrc="idea-IU-203.7717.56"
 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=982666e1554adb745de819bdd5c7418eadd504cb0324dac2245f949b5a104ced
+checksum=f1c90d475559f39cfd626c55d7882b774813de582b343c5164f3c0703145f86b
 repository=nonfree
 restricted=yes
 nopie=yes

From dfc29cd41813edbe28997028d91836eac8eeff65 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Thu, 30 Jul 2020 13:38:28 +0100
Subject: [PATCH 0237/2024] u9fs: update to 20210124

---
 srcpkgs/u9fs/patches/makefile.patch |  3 +--
 srcpkgs/u9fs/template               | 18 ++++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/u9fs/patches/makefile.patch b/srcpkgs/u9fs/patches/makefile.patch
index b65e7a58fd06..cf0860bff0c0 100644
--- a/srcpkgs/u9fs/patches/makefile.patch
+++ b/srcpkgs/u9fs/patches/makefile.patch
@@ -8,7 +8,6 @@
 -LD=cc
 -LDFLAGS=
 +LD=${CC}
-+CFLAGS+=-g -I.
++CFLAGS+=-I.
  LDTAIL=
  DESTROOT=/usr/local
- 
diff --git a/srcpkgs/u9fs/template b/srcpkgs/u9fs/template
index 96b9e6743291..79decd0299d0 100644
--- a/srcpkgs/u9fs/template
+++ b/srcpkgs/u9fs/template
@@ -1,19 +1,17 @@
 # Template file for 'u9fs'
 pkgname=u9fs
-version=20161010
+version=20210124
 revision=1
-_commit=f900662fbd61
+_commit=d65923fd17e8
 wrksrc="plan9-from-bell-labs-u9fs-${_commit}"
+build_style=gnu-makefile
+make_use_env=yes
 short_desc="Serves the Plan 9 protocol 9P from user-space"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom"
-homepage="http://plan9.bell-labs.com/magic/man2html/4/u9fs"
+maintainer="mmnmnnmnmm <mnnnm@disroot.org>"
+license="custom:MIT-like"
+homepage="https://bitbucket.org/plan9-from-bell-labs/u9fs"
 distfiles="https://bitbucket.org/plan9-from-bell-labs/u9fs/get/${_commit}.tar.gz"
-checksum=5b98b779ab29e5dd64997ac5df7b17a9c72fe1483120de297517ba0396b2c46e
-
-do_build() {
-	make
-}
+checksum=201619c1c29bad1c9ed1bc886afe7b4965cfd0781b2296c9de87db10ba71615d
 
 do_install() {
 	vbin u9fs

From 15360479d668d79130c4b5b4abbe65a57c0d9285 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:44:12 -0700
Subject: [PATCH 0238/2024] fcgi: update to 2.4.2, remove unnecessary patches,
 lint

fcgi got an update to 2.4.2 which included all of the patches we have
been carrying. Additionally, 2.4.2 changed the untar name from libfcgi
to fcgi so adjusting wrksrc accordingly.
---
 srcpkgs/fcgi/patches/CVE-2012-6687.patch      | 86 -------------------
 srcpkgs/fcgi/patches/gcc44-fix-include.patch  | 17 ----
 .../reset-file-descriptor-after-closing.patch | 17 ----
 srcpkgs/fcgi/template                         | 11 ++-
 4 files changed, 5 insertions(+), 126 deletions(-)
 delete mode 100644 srcpkgs/fcgi/patches/CVE-2012-6687.patch
 delete mode 100644 srcpkgs/fcgi/patches/gcc44-fix-include.patch
 delete mode 100644 srcpkgs/fcgi/patches/reset-file-descriptor-after-closing.patch

diff --git a/srcpkgs/fcgi/patches/CVE-2012-6687.patch b/srcpkgs/fcgi/patches/CVE-2012-6687.patch
deleted file mode 100644
index 0c5838c84ddf..000000000000
--- a/srcpkgs/fcgi/patches/CVE-2012-6687.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Author: Anton Kortunov <toshic.toshic@gmail.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417
-Description: use poll in os_unix.c instead of select to avoid problem with > 1024 connections
-Forwarded: yes, fastcgi-developers@mailman.fastcgi.com
-
-diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
-index 73e6a7f..af35aee 100755
---- libfcgi/os_unix.c
-+++ libfcgi/os_unix.c
-@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.37 2002/03/05 19:14:49 robs Exp
- #include <sys/time.h>
- #include <sys/un.h>
- #include <signal.h>
-+#include <poll.h>
- 
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
-@@ -103,6 +104,9 @@ static int volatile maxFd = -1;
- static int shutdownPending = FALSE;
- static int shutdownNow = FALSE;
- 
-+static int libfcgiOsClosePollTimeout = 2000;
-+static int libfcgiIsAfUnixKeeperPollTimeout = 2000;
-+
- void OS_ShutdownPending()
- {
-     shutdownPending = TRUE;
-@@ -168,6 +172,16 @@ int OS_LibInit(int stdioFds[3])
-     if(libInitialized)
-         return 0;
- 
-+    char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" );
-+    if(libfcgiOsClosePollTimeoutStr) {
-+        libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr);
-+    }
-+
-+    char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" );
-+    if(libfcgiIsAfUnixKeeperPollTimeoutStr) {
-+        libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr);
-+    }
-+
-     asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo));
-     if(asyncIoTable == NULL) {
-         errno = ENOMEM;
-@@ -755,19 +769,16 @@ int OS_Close(int fd)
- 
-     if (shutdown(fd, 1) == 0)
-     {
--        struct timeval tv;
--        fd_set rfds;
-+        struct pollfd pfd;
-         int rv;
-         char trash[1024];
- 
--        FD_ZERO(&rfds);
-+        pfd.fd = fd;
-+        pfd.events = POLLIN;
- 
-         do 
-         {
--            FD_SET(fd, &rfds);
--            tv.tv_sec = 2;
--            tv.tv_usec = 0;
--            rv = select(fd + 1, &rfds, NULL, NULL, &tv);
-+            rv = poll(&pfd, 1, libfcgiOsClosePollTimeout);
-         }
-         while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
-     }
-@@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (const int error)
-  */
- static int is_af_unix_keeper(const int fd)
- {
--    struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL };
--    fd_set read_fds;
--
--    FD_ZERO(&read_fds);
--    FD_SET(fd, &read_fds);
-+    struct pollfd pfd;
-+    pfd.fd = fd;
-+    pfd.events = POLLIN;
- 
--    return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds);
-+    return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN);
- }
- 
- /*
diff --git a/srcpkgs/fcgi/patches/gcc44-fix-include.patch b/srcpkgs/fcgi/patches/gcc44-fix-include.patch
deleted file mode 100644
index 1cd1c93e7ffb..000000000000
--- a/srcpkgs/fcgi/patches/gcc44-fix-include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Tatsuki Sugiura <sugi@nemui.org>
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504963
-Bug-Debian: http://bugs.debian.org/504963
-Forwarded: no
-Last-Update: 2010-02-08
-
-Index: libfcgi/libfcgi/fcgio.cpp
-===================================================================
---- libfcgi/fcgio.cpp.orig  2010-01-23 19:13:53.000000000 +0900
-+++ libfcgi/fcgio.cpp 2010-01-23 19:13:55.000000000 +0900
-@@ -22,6 +22,7 @@
- #define DLLAPI  __declspec(dllexport)
- #endif
- 
-+#include <cstdio>
- #include <limits.h>
- #include "fcgio.h"
diff --git a/srcpkgs/fcgi/patches/reset-file-descriptor-after-closing.patch b/srcpkgs/fcgi/patches/reset-file-descriptor-after-closing.patch
deleted file mode 100644
index aab07ca1608d..000000000000
--- a/srcpkgs/fcgi/patches/reset-file-descriptor-after-closing.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: André Düwel
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/1248516
-Description: reset file descriptor after closing
- Fixes problem: FastCGI Application occasionally hangs in an infinite loop
- after restarting of Apache.
-Forwarded: no
-
---- libfcgi/os_unix.c
-+++ libfcgi/os_unix.c
-@@ -1199,6 +1199,7 @@
-                     break;
- 
-                 close(socket);
-+                socket = -1;
-             }  /* socket >= 0 */
-         }  /* for(;;) */
- 
diff --git a/srcpkgs/fcgi/template b/srcpkgs/fcgi/template
index 13e2575e3f4c..fc77cdfd3de4 100644
--- a/srcpkgs/fcgi/template
+++ b/srcpkgs/fcgi/template
@@ -1,16 +1,16 @@
 # Template file for 'fcgi'
 pkgname=fcgi
-version=2.4.0
-revision=5
-wrksrc="libfcgi-${version}.orig"
+version=2.4.2
+revision=1
+wrksrc="fcgi2-${version}"
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 short_desc="Fast, open, and secure Web server interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="custom"
+license="custom:fastcgi"
 homepage="https://directory.fsf.org/wiki/Libfcgi"
 distfiles="${DEBIAN_SITE}/main/libf/libfcgi/libfcgi_${version}.orig.tar.gz"
-checksum=c21f553f41141a847b2f1a568ec99a3068262821e4e30bc9d4b5d9091aa0b5f7
+checksum=1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc
 
 disable_parallel_build=yes
 
@@ -31,4 +31,3 @@ fcgi-devel_package() {
 			vmove usr/lib/*.so
 		}
 }
-

From 4752a206c6f1483f3ca9965deb38581011440580 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 07:50:31 +1100
Subject: [PATCH 0239/2024] android-studio: update to 4.1.3.

Also clean up template.
---
 srcpkgs/android-studio/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index f2117e44196c..49c84de00f3d 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,27 +1,28 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=4.1.2
+version=4.1.3
 revision=1
 # _studio_build and _studio_rev are for downloading the zip from dl.google.com
 # https://developer.android.com/studio/#resources as of 2018-07-12
-_studio_build=201.7042882
+_studio_build=201.7199119
 _studio_rev=0
 archs="x86_64 i686"
-create_wrksrc=yes
+wrksrc="$pkgname"
 hostmakedepends="tar"
-depends="gtk+ virtual?libGL"
+depends="virtual?libGL"
 short_desc="Official Android IDE"
 maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
 license="Apache-2.0"
-homepage="http://tools.android.com/"
+homepage="http://tools.android.com"
 # changelog="https://developer.android.com/studio/releases/index.html"
 distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
-checksum=89f7c3a03ed928edeb7bbb1971284bcb72891a77b4f363557a7ad4ed37652bb9
+checksum=f599749ca47cda06d392e2764017c8a8a0c7b963a6a88ed494b432bece7cbc1b
 repository=nonfree
 restricted=yes
 python_version=2
 nopie=yes
 nostrip=yes
+noshlibprovides=yes
 
 # These files are not run or loaded on the host thus skip scanning their runtime deps
 skiprdeps="/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
@@ -59,10 +60,6 @@ skiprdeps="/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_
  /opt/android-studio/plugins/android/lib/libwebp_jni.so
  /opt/android-studio/plugins/android/lib/libwebp_jni64.so"
 
-do_extract() {
-	tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-ide-${_studio_build}-linux.tar.gz --strip-components=1 -C ${wrksrc}
-}
-
 do_install() {
 	vmkdir opt/${pkgname}
 	vcopy bin opt/${pkgname}/

From 8ebddd25e660f71763fb5675afa13a67c4188032 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Mar 2021 22:58:57 +0200
Subject: [PATCH 0240/2024] xorriso: update to 1.5.4.pl02

- use GNU_SITE for downloads
---
 srcpkgs/xorriso/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorriso/template b/srcpkgs/xorriso/template
index 51f9a18b30fd..2406cc45cfbe 100644
--- a/srcpkgs/xorriso/template
+++ b/srcpkgs/xorriso/template
@@ -1,12 +1,13 @@
 # Template file for 'xorriso'
 pkgname=xorriso
-version=1.5.3
+version=1.5.4.pl02
 revision=1
+wrksrc="${pkgname}-${version%.pl*}"
 build_style=gnu-configure
 makedepends="zlib-devel bzip2-devel readline-devel acl-devel"
 short_desc="ISO 9660 Rock Ridge Filesystem Manipulator"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/xorriso"
-distfiles="https://www.gnu.org/software/xorriso/xorriso-${version}.tar.gz"
-checksum=bb8db9274caecd44993e8242e6acff4298b3508b83ac3c51c9fd970b9e765adc
+distfiles="${GNU_SITE}/xorriso/xorriso-${version}.tar.gz"
+checksum=3ec7393d4a9dcbf5f74309c28a415f55227ec62770b95ae993ac8d7a3b152972

From 131ecec261d5b7abc2ad7996520ab48fa8443a9c Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 6 Dec 2020 10:49:49 +0100
Subject: [PATCH 0241/2024] New package: gping-1.2.0

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

diff --git a/srcpkgs/gping/template b/srcpkgs/gping/template
new file mode 100644
index 000000000000..18a07e70728e
--- /dev/null
+++ b/srcpkgs/gping/template
@@ -0,0 +1,15 @@
+# Template file for 'gping'
+pkgname=gping
+version=1.2.0
+revision=1
+build_style=cargo
+short_desc="Ping, but with a graph"
+maintainer="Paper <paper@tilde.institute>"
+license="MIT"
+homepage="https://github.com/orf/gping/"
+distfiles="https://github.com/orf/gping/archive/v${version}.tar.gz"
+checksum=2379d2d5c3e301140d9c65c4dcc2b99602acf511b2798f45009af4c1101a0716
+
+post_install() {
+	vlicense LICENSE
+}

From 04dabf5ec1ff656243a41f0d13c4a38118dfcfcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 1 Apr 2021 16:47:26 +0200
Subject: [PATCH 0242/2024] you-get: update to 0.4.1520.

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

diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index 4b61e06f824d..13b5ad1b5eca 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,6 +1,6 @@
 # Template file for 'you-get'
 pkgname=you-get
-version=0.4.1500
+version=0.4.1520
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://you-get.org/"
 distfiles="${PYPI_SITE}/y/you-get/you-get-${version}.tar.gz"
-checksum=5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92
+checksum=890be0c9637ae571bf5ead8015c4fe1e75de8adeae3aece545a1c4aeb8282fab
 
 post_install() {
 	vlicense LICENSE.txt

From 6333b4fa1ec717f55e4684f7e78cc6a1d8e684a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 1 Apr 2021 17:06:44 +0200
Subject: [PATCH 0243/2024] doctl: update to 1.58.0.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 838c22200230..6fdcf4816af2 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.57.0
+version=1.58.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=a5a3eda3075f141f419d7bf1bd4e8e0decf729b5a7ff82b5b01a6331c4f2afa9
+checksum=f4a7d608f4718a2a5e9ce5d1fcec25c16ee03d05f78ebf134faf23c261abefdf

From 40ace8538a264c0e5dfa6bc97aa68e749321b1fe Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:06:21 +0100
Subject: [PATCH 0244/2024] New package: libQuotient-0.6.6

---
 common/shlibs                |  1 +
 srcpkgs/libQuotient-devel    |  1 +
 srcpkgs/libQuotient/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/libQuotient-devel
 create mode 100644 srcpkgs/libQuotient/template

diff --git a/common/shlibs b/common/shlibs
index 9cc5873cdaed..12d6229611ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,6 +3550,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.19.0 kodi-platform-20180302_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
+libQuotient.so.0.6 libQuotient-0.6.6_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.3.1_1
diff --git a/srcpkgs/libQuotient-devel b/srcpkgs/libQuotient-devel
new file mode 120000
index 000000000000..b4566ff0d5b9
--- /dev/null
+++ b/srcpkgs/libQuotient-devel
@@ -0,0 +1 @@
+libQuotient
\ No newline at end of file
diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template
new file mode 100644
index 000000000000..effd8dca3de2
--- /dev/null
+++ b/srcpkgs/libQuotient/template
@@ -0,0 +1,25 @@
+# Template file for 'libQuotient'
+pkgname=libQuotient
+version=0.6.6
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel qt5-multimedia-devel"
+short_desc="Qt5 library to write cross-platform clients for Matrix"
+maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
+license="LGPL-2.1-or-later"
+homepage="https://matrix.org/docs/projects/sdk/quotient"
+distfiles="https://github.com/quotient-im/libQuotient/archive/${version}.tar.gz"
+checksum=33d3da5a7045bbe2611dd73104279986dd8356b24de339dd10874c1a9417bba7
+
+libQuotient-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 0fd4d1176d0eceb4ca1516e72fb8d858c375e211 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:07:41 +0100
Subject: [PATCH 0245/2024] Quaternion: update to 0.0.95.beta5.

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

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 47f72d33f243..e77415eec606 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,19 +1,21 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.9.4e
+version=0.0.95.beta5
 revision=1
+_gitversion=0.0.95-beta5
+wrksrc="Quaternion-${_gitversion}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
- qt5-multimedia-devel libqmatrixclient-devel
+ qt5-multimedia-devel qt5-quickcontrols2-devel libQuotient-devel
  $(vopt_if qtkeychain qtkeychain-qt5-devel)"
-depends="qt5-quickcontrols"
+depends="qt5-quickcontrols qt5-graphicaleffects"
 short_desc="Qt5-based IM client for the Matrix protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/quotient-im/Quaternion"
-distfiles="https://github.com/quotient-im/Quaternion/archive/${version}.tar.gz"
-checksum=7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0
+distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz"
+checksum=8a8e469df29622af7c61fe501068dd6ff26bd02bf8a12096d3f9ebbb0179e82b
 
 build_options="qtkeychain"
 build_options_default="qtkeychain"

From 19b796f118e52cacefbd614619e27619a476f4e9 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:14:13 +0100
Subject: [PATCH 0246/2024] libqmatrixclient: remove package.

The package was only used for Quaternion<=0.0.9.4, but since the newer
versions use an API under a new name -- libQuotient, it can be removed.
---
 common/shlibs                     |  1 -
 srcpkgs/libqmatrixclient-devel    |  1 -
 srcpkgs/libqmatrixclient/template | 26 --------------------------
 3 files changed, 28 deletions(-)
 delete mode 120000 srcpkgs/libqmatrixclient-devel
 delete mode 100644 srcpkgs/libqmatrixclient/template

diff --git a/common/shlibs b/common/shlibs
index 12d6229611ec..c33da050a02c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3549,7 +3549,6 @@ libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.19.0 kodi-platform-20180302_1
-libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libQuotient.so.0.6 libQuotient-0.6.6_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
diff --git a/srcpkgs/libqmatrixclient-devel b/srcpkgs/libqmatrixclient-devel
deleted file mode 120000
index 101819602ce8..000000000000
--- a/srcpkgs/libqmatrixclient-devel
+++ /dev/null
@@ -1 +0,0 @@
-libqmatrixclient
\ No newline at end of file
diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template
deleted file mode 100644
index 8e6d8e4d7c86..000000000000
--- a/srcpkgs/libqmatrixclient/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libqmatrixclient'
-pkgname=libqmatrixclient
-version=0.5.3.2
-revision=1
-wrksrc="libQuotient-${version}"
-build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-multimedia-devel"
-short_desc="Qt5 library to write cross-platform clients for Matrix"
-maintainer="Karol Kosek <krkkx@protonmail.com>"
-license="LGPL-2.1-or-later"
-homepage="https://matrix.org/docs/projects/sdk/quotient"
-distfiles="https://github.com/quotient-im/libQuotient/archive/${version}.tar.gz"
-checksum=80f7dac61a38c7d3441b6af693d40373fd817974b970c9b0edcb761aca2bf7d9
-
-libqmatrixclient-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}

From 9102dc963cbf921e9bc68ef716dd31884846500d Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 20:37:57 +0100
Subject: [PATCH 0247/2024] docker: split package, update to 20.10.5

New package: docker-cli-20.10.5
New package: moby-20.10.5
---
 srcpkgs/docker                                |   1 +
 srcpkgs/docker-cli/template                   |  36 +++++
 srcpkgs/docker/template                       | 138 ------------------
 srcpkgs/docker/update                         |   1 -
 srcpkgs/{docker => moby}/files/docker/log/run |   0
 srcpkgs/{docker => moby}/files/docker/run     |   0
 srcpkgs/moby/template                         |  51 +++++++
 7 files changed, 88 insertions(+), 139 deletions(-)
 create mode 120000 srcpkgs/docker
 create mode 100644 srcpkgs/docker-cli/template
 delete mode 100644 srcpkgs/docker/template
 delete mode 100644 srcpkgs/docker/update
 rename srcpkgs/{docker => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker => moby}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/moby/template

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..1f54c86ca232
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..88db6440de5e
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,36 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+wrksrc="cli-${version}"
+build_style=go
+go_package="github.com/docker/cli/cmd/docker"
+go_import_path="github.com/docker/cli"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
+post_install() {
+	vcompletion contrib/completion/fish/docker.fish fish
+	vcompletion contrib/completion/zsh/_docker zsh
+	vcompletion contrib/completion/bash/docker bash
+}
+
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} moby"
+}
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index e0830515a33e..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=19.03.15
-revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/moby/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
new file mode 100644
index 000000000000..6d8ef4e83729
--- /dev/null
+++ b/srcpkgs/moby/template
@@ -0,0 +1,51 @@
+# Template file for 'moby'
+pkgname=moby
+version=20.10.5
+revision=1
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd iptables xz"
+short_desc="Container engine for the Docker ecosystem"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}

From 13bfb34e54a02ffac68e836858aa392f95213342 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 1 Apr 2021 23:24:34 +0200
Subject: [PATCH 0248/2024] foot: update to 1.7.1.

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

diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index 395f0bea6a60..638234994cde 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/foot"
 changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a5a7405956fc1862638712606e502eba11f2561a77f3a9fbbb332f90c8b50ee4
+checksum=44a97d36dae6c9989aa68d2d69731679aa1f3e0c4ecc721cf79a80f5bdfdbc5f
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE

From b228a06c6507be020f91f2fa86d7e2747c879765 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 1 Apr 2021 23:33:22 +0200
Subject: [PATCH 0249/2024] wasmtime: update to 0.25.0.

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

diff --git a/srcpkgs/wasmtime/template b/srcpkgs/wasmtime/template
index 09d2ea348619..888af785f36c 100644
--- a/srcpkgs/wasmtime/template
+++ b/srcpkgs/wasmtime/template
@@ -1,6 +1,6 @@
 # Template file for 'wasmtime'
 pkgname=wasmtime
-version=0.24.0
+version=0.25.0
 revision=1
 archs="x86_64* i686* aarch64*"
 build_style=cargo
@@ -17,7 +17,7 @@ distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/WebAssembly/wasm-c-api/archive/${_wasm_c_api_commit}.tar.gz
  https://github.com/WebAssembly/WASI/archive/${_WASI_commit}.tar.gz
  https://github.com/WebAssembly/wasi-crypto/archive/${_wasi_crypto_commit}.tar.gz"
-checksum="30369a05b0fd64f8c70528e2d158f71d4b93d22cb8ea3a92a29fa1ebda64ba70
+checksum="219b79db4084a0f9d720d430d625a676d68dd0228b11cab46fd6c2a649f77034
  baf8a7f68ddd21fb7ad255acc765391c972c12f3857af8e9a979342b160e6a5a
  c774044f51431429e878bd1b9e2a4e38932f861f9211df72f75e9427eb6b8d32
  1527f437df282a98b1c708ba7848835a0bbc252d78ae8f9f90b384ce20462e7a

From 9bf390b802b2e6e5f8679a2bb80930d781f59aea Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 2 Apr 2021 03:40:51 +0200
Subject: [PATCH 0250/2024] Revert "libvpx6: update to 1.10.0."

This reverts commit 4d86d0d8af379427da13bd4563811f90d285448c.

This update breaks ABI.

Fixes https://github.com/void-linux/void-packages/issues/29941
---
 srcpkgs/libvpx6/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvpx6/template b/srcpkgs/libvpx6/template
index cde8810988b2..8084243cc21d 100644
--- a/srcpkgs/libvpx6/template
+++ b/srcpkgs/libvpx6/template
@@ -1,7 +1,10 @@
 # Template file for 'libvpx6'
+# updates generally break abi, so if you update this,
+# have fun rebuilding everything
 pkgname=libvpx6
-version=1.10.0
-revision=1
+reverts="1.10.0_1"
+version=1.9.0
+revision=2
 wrksrc=libvpx-${version}
 hostmakedepends="perl yasm"
 short_desc="VP8 and VP9 video codec"
@@ -9,7 +12,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="BSD-3-Clause-Clear"
 homepage="http://www.webmproject.org"
 distfiles="https://github.com/webmproject/libvpx/archive/v${version}.tar.gz"
-checksum=85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a
+checksum=d279c10e4b9316bf11a570ba16c3d55791e1ad6faa4404c67422eb631782c80a
 replaces="libvpx<1.8.0"
 
 do_configure() {

From 0ea1b85da61354e54c627128b508c8b4de408531 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Mon, 5 Apr 2021 21:44:53 +0000
Subject: [PATCH 0251/2024] removed-packages: add libqmatrixclient

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fb4a374d98c2..4838a7e25874 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=39
+revision=40
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -189,6 +189,8 @@ replaces="
  libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
+ libqmatrixclient<=0.5.3.2_1
+ libqmatrixclient-devel<=0.5.3.2_1
  libqzeitgeist<=0.8.0_6
  librpcsecgss<=0.19_6
  librpcsecgss-devel<=0.19_6

From 9e84f0adbab8862546b34f8a0f866c35e48d92a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 2 Apr 2021 11:46:51 +0200
Subject: [PATCH 0252/2024] tg_owt: build against static libvpx-1.10

---
 srcpkgs/tg_owt/patches/system-vpx.patch | 87 -------------------------
 srcpkgs/tg_owt/template                 |  8 ++-
 2 files changed, 6 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/tg_owt/patches/system-vpx.patch

diff --git a/srcpkgs/tg_owt/patches/system-vpx.patch b/srcpkgs/tg_owt/patches/system-vpx.patch
deleted file mode 100644
index 44da51469893..000000000000
--- a/srcpkgs/tg_owt/patches/system-vpx.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index d970719..c14226e 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -45,7 +45,6 @@ include(cmake/libpffft.cmake)
- include(cmake/librnnoise.cmake)
- include(cmake/libsrtp.cmake)
- include(cmake/libusrsctp.cmake)
--include(cmake/libvpx.cmake)
- include(cmake/libwebrtcbuild.cmake)
- include(cmake/libyuv.cmake)
- if (NOT WIN32 AND NOT APPLE)
-@@ -77,13 +76,6 @@ if (is_x86 OR is_x64)
-         tg_owt::librnnoise
-         tg_owt::libsrtp
-         tg_owt::libusrsctp
--        tg_owt::libvpx
--        tg_owt::libvpx_mmx
--        tg_owt::libvpx_sse2
--        tg_owt::libvpx_ssse3
--        tg_owt::libvpx_sse4
--        tg_owt::libvpx_avx
--        tg_owt::libvpx_avx2
-         tg_owt::libyuv
-     )
- else()
-@@ -97,7 +89,6 @@ else()
-         tg_owt::librnnoise
-         tg_owt::libsrtp
-         tg_owt::libusrsctp
--        tg_owt::libvpx
-         tg_owt::libyuv
-     )
- endif()
-@@ -122,6 +113,7 @@ if (APPLE)
-     target_link_libraries(tg_owt PUBLIC tg_owt::libsdkmacos)
- endif()
- 
-+link_vpx(tg_owt)
- link_openssl(tg_owt)
- link_ffmpeg(tg_owt)
- link_opus(tg_owt)
-@@ -1868,16 +1860,6 @@ elseif (APPLE)
- endif()
- 
- set(vpx_export)
--if (is_x86 OR is_x64)
--    set(vpx_export
--        libvpx_mmx
--        libvpx_sse2
--        libvpx_ssse3
--        libvpx_sse4
--        libvpx_avx
--        libvpx_avx2
--    )
--endif()
- 
- set(export_targets
-     tg_owt
-@@ -1887,7 +1869,6 @@ set(export_targets
-     librnnoise
-     libsrtp
-     libusrsctp
--    libvpx
-     ${vpx_export}
-     libwebrtcbuild
-     libyuv
-diff --git cmake/external.cmake cmake/external.cmake
-index 964e260..82d68d0 100644
---- cmake/external.cmake
-+++ cmake/external.cmake
-@@ -129,3 +129,15 @@ function(link_dl target_name)
-         target_link_libraries(${target_name} PRIVATE ${CMAKE_DL_LIBS})
-     endif()
- endfunction()
-+
-+# libvpx
-+function(link_vpx target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(VPX vpx)
-+    endif()
-+    if (VPX_FOUND)
-+        target_include_directories(${target_name} PRIVATE ${VPX_INCLUDE_DIRS})
-+        target_link_libraries(${target_name} PRIVATE ${VPX_LINK_LIBRARIES})
-+    endif()
-+endfunction()
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index b63fd17281a4..6c164865b87c 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,23 +1,26 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210321
-revision=1
+revision=2
 _commit=2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
+_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf"
 makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
- libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
+ ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/desktop-app/tg_owt"
 distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
+ https://chromium.googlesource.com/webm/libvpx/+archive/${_libvpx_commit}.tar.gz
  https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz"
 checksum="@2873f3c9a6e5a93976623d4502af59bf6c8a3536aa9928acf45cea0a20e23ec0
+ @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9
  @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
 skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"
 
@@ -31,4 +34,5 @@ fi
 
 post_extract() {
 	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libyuv_commit}.tar.gz -C ${wrksrc}/src/third_party/libyuv
+	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libvpx_commit}.tar.gz -C ${wrksrc}/src/third_party/libvpx/source/libvpx
 }

From a0075330b17ff5db858fd99495d55ad052fce53c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 2 Apr 2021 11:47:21 +0200
Subject: [PATCH 0253/2024] telegram-desktop: rebuild against static
 libvpx-1.10

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

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 9f74895d695c..8940f58c01a6 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.7.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 4ded19c8e6ce864d928359afb4baace116e6a930 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 14:58:45 +0200
Subject: [PATCH 0254/2024] New package: texlive2021-bin-2021

---
 srcpkgs/texlive2021-bin/INSTALL            | 15 ++++++++
 srcpkgs/texlive2021-bin/INSTALL.msg        | 25 ++++++++++++
 srcpkgs/texlive2021-bin/REMOVE             |  8 ++++
 srcpkgs/texlive2021-bin/files/void.profile |  8 ++++
 srcpkgs/texlive2021-bin/template           | 45 ++++++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 srcpkgs/texlive2021-bin/INSTALL
 create mode 100644 srcpkgs/texlive2021-bin/INSTALL.msg
 create mode 100644 srcpkgs/texlive2021-bin/REMOVE
 create mode 100644 srcpkgs/texlive2021-bin/files/void.profile
 create mode 100644 srcpkgs/texlive2021-bin/template

diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL
new file mode 100644
index 000000000000..9a5b1df97deb
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/INSTALL
@@ -0,0 +1,15 @@
+case "${ACTION}" in
+post)
+	case "${UPDATE}" in
+	no)
+		cd opt/texlive2021-installer
+		case "${ARCH}" in
+			x86_64-musl)
+			./install-tl -profile void.profile -force-platform x86_64-linuxmusl
+			;;
+			*)
+			./install-tl -profile void.profile
+			;;
+		esac
+	esac
+esac
diff --git a/srcpkgs/texlive2021-bin/INSTALL.msg b/srcpkgs/texlive2021-bin/INSTALL.msg
new file mode 100644
index 000000000000..0d3107929a64
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/INSTALL.msg
@@ -0,0 +1,25 @@
+- TeXLive is free software see the files:
+
+  /usr/share/licenses/texlive2021-bin/LICENSE.TL
+  /usr/share/licenses/texlive2021-bin/LICENSE.CTAN
+
+=====================================================================
+
+  To update you TeXLive installation use only the program 
+
+  /opt/texlive/2021/bin/<arch>/tlmgr
+
+  where <arch> is:
+    - x86_64-linux  ==> x86_64 architecture
+    - i386-linux    ==> i386 architecture
+
+  see:
+
+  http://www.tug.org/texlive/doc/tlmgr.html#EXAMPLES
+  
+  for the details and the documentation in 
+    		 		 
+  WARNING: To avoid messing up your TeXLive installation, DON'T use
+  the installation scripts in /opt/texlive-installer.
+
+  For a full installation, run "tlmgr install scheme-full".
diff --git a/srcpkgs/texlive2021-bin/REMOVE b/srcpkgs/texlive2021-bin/REMOVE
new file mode 100644
index 000000000000..ab00192b5165
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/REMOVE
@@ -0,0 +1,8 @@
+# This script will clear the TeXLive directory  
+#
+case "${ACTION}" in
+post)
+	rm -rf opt/texlive/2021
+	rm -r opt/texlive2021-installer
+	;;
+esac
diff --git a/srcpkgs/texlive2021-bin/files/void.profile b/srcpkgs/texlive2021-bin/files/void.profile
new file mode 100644
index 000000000000..53bc9a044664
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/files/void.profile
@@ -0,0 +1,8 @@
+# texlive.profile written for voidlinux
+TEXDIR ../texlive/2021
+TEXMFCONFIG ~/.texlive2021/texmf-config
+TEXMFHOME ~/texmf
+TEXMFLOCAL ../texlive/texmf-local
+TEXMFSYSCONFIG ../texlive/2021/texmf-config
+TEXMFSYSVAR ../texlive/2021/texmf-var
+TEXMFVAR ~/.texlive2021/texmf-var
diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template
new file mode 100644
index 000000000000..5c9e334c788e
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/template
@@ -0,0 +1,45 @@
+# Template file for 'texlive2021-bin'
+pkgname=texlive2021-bin
+version=2021
+revision=1
+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"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
+homepage="http://tug.org/texlive/"
+distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
+checksum=74eac0855e1e40c8db4f28b24ef354bd7263c1f76031bdc02b52156b572b7a1d
+
+# Package build options
+build_options="basic small medium full"
+build_options_default="small"
+desc_option_basic="Install TeXLive using scheme-basic"
+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() {
+	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
+		${wrksrc}/install-tl*/tlpkg/installer/wget
+}
+
+do_install() {
+	vmkdir opt/texlive${version}-installer
+	vcopy "install-tl-*/*" /opt/texlive${version}-installer
+	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer
+	if [ "$build_option_basic" ]; then
+		echo "selected_scheme scheme-basic"
+	elif [ "$build_option_small" ]; then
+		echo "selected_scheme scheme-small"
+	elif [ "$build_option_medium" = "medium" ];then
+		echo "selected_scheme scheme-medium"
+	elif [ "$build_option_full" ];then
+		echo "selected_scheme scheme-full"
+	fi >>${DESTDIR}/opt/texlive${version}-installer/void.profile
+	vlicense ${DESTDIR}/opt/texlive${version}-installer/LICENSE.CTAN
+	vlicense ${DESTDIR}/opt/texlive${version}-installer/LICENSE.TL
+}

From b23c8688e2652b67070d4ac6c2bd9b9622e8e56c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:05:02 +0200
Subject: [PATCH 0255/2024] xscreensaver: update to 6.00.

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

diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 518b33e5637f..12c037251f44 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'xscreensaver'
 pkgname=xscreensaver
-version=5.45
+version=6.00
 revision=1
 build_style=gnu-configure
 configure_args="--with-pam --with-login-manager
@@ -9,7 +9,7 @@ configure_args="--with-pam --with-login-manager
  --libdir=${XBPS_CROSS_BASE}/lib"
 conf_files="/etc/pam.d/xscreensaver"
 hostmakedepends="bc intltool pkg-config"
-makedepends="glu-devel libXinerama-devel libXmu-devel libXpm-devel
+makedepends="glu-devel libXi-devel libXinerama-devel libXmu-devel libXpm-devel
  libXrandr-devel libglade-devel pam-devel"
 short_desc="Screen saver and locker for the X Window System"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://www.jwz.org/xscreensaver/"
 changelog="https://www.jwz.org/xscreensaver/changelog.html"
 distfiles="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz"
-checksum=7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d
+checksum=585088974721b828ebd71fd3ebb019d1bf312133c956eac9672d61f6b49d7706
 
 do_install() {
 	vmkdir etc/pam.d

From 57f32bd9b74e0e0b35620cc067882e92addb418b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:07:29 +0200
Subject: [PATCH 0256/2024] perltidy: update to 20210402.

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

diff --git a/srcpkgs/perltidy/template b/srcpkgs/perltidy/template
index 0b7008fab4a2..1509b974310a 100644
--- a/srcpkgs/perltidy/template
+++ b/srcpkgs/perltidy/template
@@ -1,6 +1,6 @@
 # Template file for 'perltidy'
 pkgname=perltidy
-version=20210111
+version=20210402
 revision=1
 wrksrc="Perl-Tidy-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://metacpan.org/release/Perl-Tidy"
 distfiles="${CPAN_SITE}/Perl/Perl-Tidy-${version}.tar.gz"
-checksum=207666ceaf5d4eaf7a608c8f4a77f212cae811bb88ce159c33e2d8a0b5da189f
+checksum=b6e9c75d4c8e6047fb5c2e9c60f3ea1cc5783ffde389ef90832d1965b345e663

From c16d7fe5b6d3519f8cd1ea3b0e7f5e165a283f78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:08:59 +0200
Subject: [PATCH 0257/2024] sc-im: update to 0.8.1.

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

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index f9bc91e23409..ec635fdb5cfe 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,6 +1,6 @@
 # Template file for 'sc-im'
 pkgname=sc-im
-version=0.8.0
+version=0.8.1
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause"
 homepage="https://github.com/andmarti1424/sc-im/"
 distfiles="https://github.com/andmarti1424/${pkgname}/archive/v${version}.tar.gz"
-checksum=edc9b9d2dc5ac37c31a46462a1387605983149a1abba00d47ac22f2726ce6d27
+checksum=73958f2adf2548be138f90a1fa2cb3a9c316a6d8d78234ebb1dc408cbf83bac7
 
 post_extract() {
 	vsed -i -e 's/lua51/lua5.1/g' \

From 9b081c8da198bbe76338e4c479bcbbc6d396c23a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:28:51 +0200
Subject: [PATCH 0258/2024] coq: update to 8.13.2.

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

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 2f8f04c5e5ec..ae46d8285868 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,6 +1,6 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.13.1
+version=8.13.2
 revision=1
 hostmakedepends="camlp5 ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only"
 homepage="https://coq.inria.fr"
 distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=95e71b16e6f3592e53d8bb679f051b062afbd12069a4105ffc9ee50e421d4685
+checksum=1e7793d8483f1e939f62df6749f843df967a15d843a4a5acb024904b76e25a14
 nopie=yes
 nocross=yes
 

From 8948ce1dbfc975cb2bec837b7e4b04a9d26ca4ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:29:00 +0200
Subject: [PATCH 0259/2024] mathcomp: rebuild for coq-8.13.2_1.

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

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index c8d20840bc18..17976c9e1ed2 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.12.0
-revision=3
+revision=4
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 133badfbead4ab6cd58d79315ff38bcf522089e2 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Fri, 2 Apr 2021 21:54:52 +0700
Subject: [PATCH 0260/2024] vivaldi: update to 3.7.2218.52

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 81a02717c184..3ea0ec4e7192 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.7.2218.45
+version=3.7.2218.52
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=e4d6f791dbb823bf4c3680049328a6bf9d3c2959a5d8c7d8df7cd90038e40387
+	checksum=f131f182bc6dd6e735a83ffaa4ff2a3cca90184daa26e0996d1cb64ed765ab2a
 else
 	_debarch=i386
-	checksum=a30ccbe82261db9651457b01142bf0544db148cdbca7e515e8a03a430310dfdd
+	checksum=6f93e285e1cd48103fbdc3266e1188556ed2a98b08f7c6420eeb07c05c559a08
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From adccd05b92a4fd35eebb7e345d4bdadc209c76dd Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 2 Apr 2021 07:39:54 -0600
Subject: [PATCH 0261/2024] sanoid: update to 2.1.0

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

diff --git a/srcpkgs/sanoid/template b/srcpkgs/sanoid/template
index c6b509615751..18ed4725bf14 100644
--- a/srcpkgs/sanoid/template
+++ b/srcpkgs/sanoid/template
@@ -1,6 +1,6 @@
 # Template file for 'sanoid'
 pkgname=sanoid
-version=2.0.3
+version=2.1.0
 revision=1
 depends="perl perl-Config-IniFiles perl-Capture-Tiny"
 short_desc="Policy-driven snapshot management tool for ZFS filesystems"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.openoid.net/products/"
 distfiles="https://github.com/jimsalterjrs/sanoid/archive/v$version.tar.gz"
 conf_files="/etc/sanoid/sanoid.conf /etc/sanoid/sanoid.defaults.conf"
-checksum=63115326695a00dc925d3ec8c307ed2543bb0a2479f2b15be3192bf2c7d50037
+checksum=97b41f689a7ea23671dac3fcb20540f6d3aee880ed3282df7448756f99e7040e
 
 do_install() {
 	     vdoc README.md

From f230a9abe14827d9016514de30cb8e9aff7b806a Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 1 Apr 2021 18:06:16 +0300
Subject: [PATCH 0262/2024] qutebrowser: update to 2.1.1; adopt

Closes: #29934 [via git-merge-pr]
---
 srcpkgs/qutebrowser/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 063570d88889..0972f56d7ae5 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,18 +1,18 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-yaml
  python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite"
 short_desc="Keyboard-focused browser with a minimal GUI"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=1ddd373a4f31f16ba809870779918a8920b13dcb936f2d41ff4b27cfd4cae63b
+checksum=b71b00ad7d498911978e5bbd153a6dd0450ac6ade3e5bf398fc96e15328342ce
 nostrip=yes
 
 build_options="webengine"

From 1dee8c56acc8817b84590b828d4a92fb3bced090 Mon Sep 17 00:00:00 2001
From: Jaume Devesa <jaume@mailbox.org>
Date: Fri, 2 Apr 2021 07:32:02 +0200
Subject: [PATCH 0263/2024] sfeed_curses: update to 0.9.10

---
 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 141536a638c1..2ae38ed80866 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.9
+version=0.9.10
 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=29bac3112c9804f7d3bfd1b25b72b42390f97723ef5021ed5584a54e2774118d
+checksum=d64a64116cd16ba00c592ca08a8d545d2fa91c2cf9cf8673e2f0b6c7b101b2db
 
 post_install() {
 	vlicense LICENSE

From 93839e5963e91ce9739adb8b96643244a8256aa9 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Fri, 2 Apr 2021 07:32:52 +0200
Subject: [PATCH 0264/2024] python3-plotly: update to 4.14.3.

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

diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
index e48cfde27c34..dde1b2c25226 100644
--- a/srcpkgs/python3-plotly/template
+++ b/srcpkgs/python3-plotly/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-plotly'
 pkgname=python3-plotly
-version=4.14.1
+version=4.14.3
 revision=1
 wrksrc="plotly-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://plot.ly/python/"
 changelog="https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
-checksum=f2a38726ddc7ce185a277c78a41b50bb8cfcfa4f53b45a481417401cadc0454c
+checksum=7d8aaeed392e82fb8e0e48899f2d3d957b12327f9d38cdd5802bc574a8a39d91
 conf_files="etc/jupyter/nbconfig/notebook.d/plotlywidget.json"
 
 do_check() {

From 04ead3e6af2919ffd26ccf95d9d27794b39bca9a Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Thu, 1 Apr 2021 13:59:03 -0400
Subject: [PATCH 0265/2024] xf86-video-nouveau: update to 1.0.17.

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

diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index dabd68e3ea5b..5eb9af9c6e62 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -1,17 +1,17 @@
 # Template file for 'xf86-video-nouveau'
 pkgname=xf86-video-nouveau
-version=1.0.16
-revision=2
+version=1.0.17
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg opensource NVIDIA video driver"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
 license="MIT"
-homepage="http://nouveau.freedesktop.org/wiki/"
+homepage="http://nouveau.freedesktop.org"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.gz"
-checksum=83553d4625e2990e569312e26540bebbdb2de14896ad4e9a9c872eda1df6cc7d
+checksum=21e9233b2c6304b976c526729ba48660c16976a757a319fa95cc8a8605316105
 lib32disabled=yes
 
 LDFLAGS="-Wl,-z,lazy"

From 50fc237c5495348c5bfdb00a586a1408de6ef846 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Fri, 2 Apr 2021 07:26:40 +0200
Subject: [PATCH 0266/2024] python3-xlrd: update to 2.0.1.

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

diff --git a/srcpkgs/python3-xlrd/template b/srcpkgs/python3-xlrd/template
index 8d6859e4dfdf..bf8cc5060c9d 100644
--- a/srcpkgs/python3-xlrd/template
+++ b/srcpkgs/python3-xlrd/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xlrd'
 pkgname=python3-xlrd
-version=1.2.0
-revision=2
+version=2.0.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="pulux <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="http://www.python-excel.org/"
 distfiles="${PYPI_SITE}/x/xlrd/xlrd-${version}.tar.gz"
-checksum=546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2
+checksum=f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88
 
 post_install() {
 	vlicense LICENSE

From 6cdaebd88b76929714f0bdc770187bea075913ab Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Fri, 2 Apr 2021 07:23:21 +0200
Subject: [PATCH 0267/2024] python3-opcua: update to 0.98.13.

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

diff --git a/srcpkgs/python3-opcua/template b/srcpkgs/python3-opcua/template
index cd46a30efccf..f31b9971db66 100644
--- a/srcpkgs/python3-opcua/template
+++ b/srcpkgs/python3-opcua/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-opcua'
 pkgname=python3-opcua
-version=0.98.12
-revision=2
+version=0.98.13
+revision=1
 wrksrc="opcua-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-cryptography python3-dateutil python3-lxml"
+depends="python3-cryptography python3-dateutil python3-lxml python3-pytz"
+checkdepends="$depends"
 short_desc="Pure Python OPC-UA client and server library"
 maintainer="Pulux <pulux@pf4sh.de>"
 license="LGPL-3.0-or-later"
 homepage="http://freeopcua.github.io/"
 distfiles="${PYPI_SITE}/o/opcua/opcua-${version}.tar.gz"
-checksum=947cf0de842f9eee86ed2c39607c2b2c5a288ed42e0298d87c7a663ec7ee48aa
+checksum=3352f30b5fed863146a82778aaf09faa5feafcb9dd446a4f49ff34c0c3ebbde6

From 76164c3856862e528609026aeffa0a7b6410e821 Mon Sep 17 00:00:00 2001
From: Adrian Siekierka <kontakt@asie.pl>
Date: Fri, 2 Apr 2021 10:51:41 +0200
Subject: [PATCH 0268/2024] cherrytree: update to 0.99.33.

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

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index f3c8286b11d2..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,18 +1,19 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.27
+version=0.99.33
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
- libxml++-devel gtksourceviewmm-devel gspell-devel gtkmm-devel"
+ libxml++-devel gtksourceviewmm-devel gspell-devel gtkmm-devel
+ fmt-devel spdlog"
 depends="desktop-file-utils"
 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=fff13c6b764eaa952616308a53cb5bd863b37f913bd74891117b4da20ff29832
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"

From 8bd6b3a0f994c1a761696f237969914d2805f568 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 2 Apr 2021 18:34:15 +0200
Subject: [PATCH 0269/2024] ldacBT: broken on big endian

---
 srcpkgs/ldacBT/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/ldacBT/template b/srcpkgs/ldacBT/template
index 9d31ff7a8721..5f0638addee7 100644
--- a/srcpkgs/ldacBT/template
+++ b/srcpkgs/ldacBT/template
@@ -11,6 +11,10 @@ homepage="https://github.com/EHfive/ldacBT"
 distfiles="https://github.com/EHfive/ldacBT/releases/download/v${version}/ldacBT-${version}.tar.gz"
 checksum="4bd8eece78bb5c1361fab95743e7100506e2408a25c4a592a0f8d349746dc5b4"
 
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	broken="unsupported upstream"
+fi
+
 ldacBT-devel_package() {
 	depends="ldacBT>=${version}_${revision}"
 	short_desc+=" - development files"

From 1925a1759c7757f6b49e1d6587a17a26a3564337 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 2 Apr 2021 18:36:05 +0200
Subject: [PATCH 0270/2024] pipewire: ldac only on little endian

---
 srcpkgs/pipewire/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 9c64ff428054..9ab2c72fb8f7 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -9,7 +9,7 @@ configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disab
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
- libopenaptx-devel fdk-aac-devel ldacBT-devel"
+ libopenaptx-devel fdk-aac-devel"
 depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
@@ -27,6 +27,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
+	makedepends+=" ldacBT-devel"
+fi
+
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"

From 407059f617defb7a7f32e089a6710654cd5ed749 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 30 Mar 2021 12:07:44 +0200
Subject: [PATCH 0271/2024] libusb: update to 1.0.24.

Closes: #29876 [via git-merge-pr]
---
 srcpkgs/libusb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 3660d0a45fd3..1f2036d0ecad 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libusb'
 pkgname=libusb
-version=1.0.23
+version=1.0.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libusb.info"
 distfiles="https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2"
-checksum=db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d
+checksum=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
 
 libusb-devel_package() {
 	short_desc+=" - development files"

From 53b82d1524b2373c6cdaeae8bbc416e9e0164a2a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 2 Apr 2021 19:52:34 +0200
Subject: [PATCH 0272/2024] libvirt: update to 7.2.0.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 52c0ee252845..1b7f3740c5b6 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.1.0
+version=7.2.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=870f180d80256411c5afc39bc5aac4f8acca04a4e0725c576ad24053dc64a06c
+checksum=01f459d0c7ba5009622a628dba1a026200e8f4a299fea783b936a71d7e0ed1d0
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From 328cd7c288bb10d2cde53d9f50a565047d61b9c7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 2 Apr 2021 19:55:43 +0200
Subject: [PATCH 0273/2024] libvirt-python3: update to 7.2.0.

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

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 7988fa1482fc..f9dbeedc483a 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.1.0
+version=7.2.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=faafd31e407f9cb750a73349c007651ca8954ebd455e55b0a20e96de81c50037
+checksum=c0c3bac54c55622e17927b09cd9843869600d71842fb072c99491fe2608dcee7

From 6f66319eb20d6fcef1ffa2c9139a57cbc7a0ba58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 2 Apr 2021 15:17:30 -0300
Subject: [PATCH 0274/2024] firefox: disable debug packages when built on
 32-bit hosts.

cc1plus runs out of memory otherwise:
cargo:warning=cc1plus: out of memory allocating 65536 bytes after a total of 1010126848 bytes
---
 srcpkgs/firefox/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0fd5d573c483..013422c663b7 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -40,6 +40,12 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
+# work around large debug symbols on 32-bit hosts
+# cargo:warning=cc1plus: out of memory allocating 65536 bytes after a total of 1010126848 bytes
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+	nodebug=yes
+fi
+
 # we need this because cargo verifies checksums of all files in vendor
 # crates when it builds and gives us no way to override or update the
 # file sanely... so just clear out the file list
@@ -129,8 +135,6 @@ do_build() {
 
 	# work around large debug symbols on 32-bit hosts
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
-		export CFLAGS="${CFLAGS/-g/-g1}"
-		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
 		vsed -i 's/debug_info = "2"/debug_info = "0"/' \

From 28ab205c30bc3296d5b1d8a6ab3f0ec70337319b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 2 Apr 2021 20:26:34 +0200
Subject: [PATCH 0275/2024] tg_owt: disable NEON on armv7l

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

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 6c164865b87c..7fc356b67f61 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -7,7 +7,7 @@ _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 wrksrc="tg_owt-$_commit"
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=OFF"
+configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF"
 hostmakedepends="pkg-config yasm protobuf"
 makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  ffmpeg-devel libjpeg-turbo-devel protobuf-devel"

From 645664884f438529e798f334e10fdd3c95784203 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 2 Apr 2021 20:54:40 +0200
Subject: [PATCH 0276/2024] lua54-luaposix: update to 35.0

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

diff --git a/srcpkgs/lua54-luaposix/template b/srcpkgs/lua54-luaposix/template
index d776c3a598af..a03cbe1debab 100644
--- a/srcpkgs/lua54-luaposix/template
+++ b/srcpkgs/lua54-luaposix/template
@@ -1,8 +1,8 @@
 # Template file for 'lua54-luaposix'
 pkgname=lua54-luaposix
-version=34.1.1
-revision=3
-wrksrc="luaposix-release-v${version}"
+version=35.0
+revision=1
+wrksrc=luaposix-${version}
 hostmakedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
 depends="lua54 lua54-stdlib-normalize"
@@ -11,8 +11,8 @@ short_desc="${_desc} (5.4.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://luaforge.net/projects/luaposix/"
-distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz"
-checksum=273df2dbd9581a2f22e4265f14d0d759c487c0c9830f94395d7d690474382810
+distfiles="https://github.com/luaposix/luaposix/archive/refs/tags/v${version}.tar.gz"
+checksum=a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809
 lib32disabled=yes
 
 post_extract() {

From f2f7db344f8dd5afe8f39f671753b614b0b3255b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 2 Apr 2021 19:28:31 +0300
Subject: [PATCH 0277/2024] github-cli: update to 1.8.1

---
 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 77357dc600ad..4d9fc015800c 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.8.0
+version=1.8.1
 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=13576c42a0cb1486370b876eccebe498c1ef84868893ae41a1f717229be4d6bb
+checksum=5bdbc589a6d5cca241b2dc467d846a8f23c465d78efd898271f18b636608d6e6
 
 pre_build() {
 	local _date

From 8df2e87803fbcc1b6ede46508fff16c9ba8b05c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 2 Apr 2021 23:15:14 -0300
Subject: [PATCH 0278/2024] firefox: decrease memory requirements for 32bit
 builders.

Flags pulled from Alpine build.

Failure can be seen in
https://build.voidlinux.org/builders/i686_builder/builds/31550/steps/shell_3/logs/stdio
> 79:15.36   cargo:warning=virtual memory exhausted: Cannot allocate memory
---
 srcpkgs/firefox/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 013422c663b7..58cc021a39d2 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -135,6 +135,8 @@ do_build() {
 
 	# work around large debug symbols on 32-bit hosts
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+		echo "ac_add_options --disable-debug" >>.mozconfig
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
 		vsed -i 's/debug_info = "2"/debug_info = "0"/' \

From 617b5ad77e1a805a5cd326bde1f8f36f921c10f5 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, 3 Apr 2021 09:42:04 +0700
Subject: [PATCH 0279/2024] devil: patch for jasper 2.0.17

---
 srcpkgs/devil/patches/jasper-2.0.17.patch | 24 +++++++++++++++++++++++
 srcpkgs/devil/template                    |  1 -
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/devil/patches/jasper-2.0.17.patch

diff --git a/srcpkgs/devil/patches/jasper-2.0.17.patch b/srcpkgs/devil/patches/jasper-2.0.17.patch
new file mode 100644
index 000000000000..c19ebb465b17
--- /dev/null
+++ b/srcpkgs/devil/patches/jasper-2.0.17.patch
@@ -0,0 +1,24 @@
+ jasper 2.0.17 fixes some signed compare without breaking ABI
+ but it breaks API
+Index: DevIL/src-IL/src/il_jp2.cpp
+===================================================================
+--- DevIL/src-IL/src/il_jp2.cpp.orig
++++ DevIL/src-IL/src/il_jp2.cpp
+@@ -314,15 +314,15 @@ ILboolean iLoadJp2Internal(jas_stream_t
+ 
+ 
+ 
+-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
++static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
+ {
+ 	obj;
+ 	return iread(buf, 1, cnt);
+ }
+ 
+-static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
++static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned cnt)
+ {
+ 	obj;
+ 	return iwrite(buf, 1, cnt);
+ }
+ 
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index e15ca174966f..95bc542c6d6e 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -5,7 +5,6 @@ revision=3
 wrksrc="DevIL"
 build_wrksrc="DevIL"
 build_style=cmake
-configure_args="--enable-ILU --enable-ILUT --with-examples"
 hostmakedepends="pkg-config"
 makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
  glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"

From 909606dbaf6bab9bdde8bc355773ca911d786b5b 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, 14 Mar 2021 20:18:03 +0700
Subject: [PATCH 0280/2024] build-style/cmake: set CMAKE_BUILD_TYPE to None

- CMAKE_BUILD_TYPE=Release will force -O3 instead of respecting our
  CFLAGS and CXXFLAGS
- Theoretically, we could patch cmake to always use -O2 instead,
  however, patching will break users' expectation when compiling their
  our code.
- RelWithDebInfo could be another option if it's acceptable to always
  have debug symbol available.
- However, some projects ignore all CFLAGS and CXXFLAGS;
- Some other projects relies on CMAKE_BUILD_TYPE=Release to install to
  correct location and/or disable coverage.
- To get away with -O3, we need patching either ways, let's go with
  CMAKE_BUILD_TYPE=None, and patch all problematic softwares.
---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 5100a96dfd7b..9d1a1a7a1941 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -52,7 +52,7 @@ _EOF
 		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
-	cmake_args+=" -DCMAKE_BUILD_TYPE=Release"
+	cmake_args+=" -DCMAKE_BUILD_TYPE=None"
 	cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
 
 	if [[ $build_helper = *"qemu"* ]]; then

From f5638e63f768801f7870f6f07fdfa9b4674340f2 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 21:33:44 +0700
Subject: [PATCH 0281/2024] cmake-bootstrap: update to 3.20.0.

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

diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index c97760473629..f9c6548ef0ad 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-version=3.19.7
+version=3.20.0
 revision=1
 wrksrc=cmake-$version
 bootstrap=yes
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -36,7 +36,6 @@ post_patch() {
 	rm -rf Utilities/cmexpat
 	rm -rf Utilities/cmlibarchive
 	rm -rf Utilities/cmliblzma
-	rm -rf Utilities/cmlibrhash
 	rm -rf Utilities/cmnghttp2
 	rm -rf Utilities/cmzlib
 	rm -rf Utilities/cmzstd

From 6251074abc8079ca3924fdff15999fa6fe409893 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:47:38 +0700
Subject: [PATCH 0282/2024] cmake: update to 3.20.0.

---
 ...onfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch | 13 +++++++++++++
 srcpkgs/cmake/template                              |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch

diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
new file mode 100644
index 000000000000..d0a2860cc86e
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
@@ -0,0 +1,13 @@
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..84ef26b0fd 100644
+--- Tests/ConfigSources/CMakeLists.txt
++++ Tests/ConfigSources/CMakeLists.txt
+@@ -75,7 +75,7 @@ add_custom_command(APPEND
+   )
+ 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 None Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
+ endforeach()
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index aa32cea5f048..93dbc971646c 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.19.7
+version=3.20.0
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens04@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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
 
 export CMAKE_GENERATOR="Unix Makefiles"
 

From 626938af5d624df629a57bd820f841c3958ea534 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 21:33:47 +0700
Subject: [PATCH 0283/2024] cmake-gui: update to 3.20.0.

---
 srcpkgs/cmake-gui/patches                 |  1 +
 srcpkgs/cmake-gui/patches/musl-test.patch | 15 ---------------
 srcpkgs/cmake-gui/template                |  4 ++--
 3 files changed, 3 insertions(+), 17 deletions(-)
 create mode 120000 srcpkgs/cmake-gui/patches
 delete mode 100644 srcpkgs/cmake-gui/patches/musl-test.patch

diff --git a/srcpkgs/cmake-gui/patches b/srcpkgs/cmake-gui/patches
new file mode 120000
index 000000000000..6f3ac554b361
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches
@@ -0,0 +1 @@
+../cmake/patches
\ No newline at end of file
diff --git a/srcpkgs/cmake-gui/patches/musl-test.patch b/srcpkgs/cmake-gui/patches/musl-test.patch
deleted file mode 100644
index 4da8c2f9cfc6..000000000000
--- a/srcpkgs/cmake-gui/patches/musl-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig	2020-12-05 13:27:21.098078774 +0700
-+++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake	2020-12-05 13:29:19.931553018 +0700
-@@ -33,9 +33,9 @@
-   [[librunpath_parent_unresolved\.so]]
-   [[librunpath_unresolved\.so]]
-   )
--check_contents(deps/udeps1.txt "^${_check}$")
--check_contents(deps/udeps2.txt "^${_check}$")
--check_contents(deps/udeps3.txt "^${_check}$")
-+check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$")
- set(_check
-   "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
-   )
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 2643997e4f1c..461463b3bc30 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.19.7
+version=3.20.0
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
 
 # XXX: cmake is broken if cmake was built with -GNinja
 # https://bugs.gentoo.org/596460

From 9c74c45059cc95459d174fa24cc379c14670dcd7 Mon Sep 17 00:00:00 2001
From: Andrea D'Amore <a@d-amo.re>
Date: Wed, 17 Jun 2020 08:24:44 +0200
Subject: [PATCH 0284/2024] brother-brscan3: update to 0.2.13

Add license from website.
Drop building debug package, libs are stripped at the source.
Mimic description from package brother-brscan4 since this package
targets multiple Brother devices.

Closes: #22998 [via git-merge-pr]
---
 srcpkgs/brother-brscan3/template | 49 +++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/brother-brscan3/template b/srcpkgs/brother-brscan3/template
index 92e5759446b6..e51bddc1dbeb 100644
--- a/srcpkgs/brother-brscan3/template
+++ b/srcpkgs/brother-brscan3/template
@@ -1,26 +1,29 @@
 # Template file for 'brother-brscan3'
 pkgname=brother-brscan3
-version=0.2.11
-revision=6
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
-homepage="http://support.brother.com/g/b/index.aspx"
-license="GPL-2"
-short_desc="Scanner driver for the brother DCP-197C printer/scanner"
+version=0.2.13
+revision=1
 archs="i686 x86_64"
-makedepends="sane-devel"
-depends="sane"
 create_wrksrc=yes
+hostmakedepends="tar"
+makedepends="sane-devel curl"
+depends="sane"
+short_desc="SANE scanner driver for brscan3-compatible Brother scanners"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it.invalid>"
+license="custom:BrotherEULA"
+homepage="http://support.brother.com/g/b/index.aspx"
 nopie=yes
+nodebug=yes
+_license_checksum=4ab8b9269a74377ee85458cc4dfbacfbf6d26665426572fe16f7102af214bd3c
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="http://download.brother.com/welcome/dlf006642/brscan3-${version}-5.amd64.deb"
-	checksum="cce23bd9481f0fb3856e6c1fecdb65d7b21d1efb74e1741ef6185fa952319beb"
-	debpkgid="5.amd64"
+	debpkgid="1.amd64"
+	distfiles="http://download.brother.com/welcome/dlf006642/brscan3-${version}-${debpkgid}.deb"
+	checksum="446adf531bf39032892e9504ce34b7bf889e0f8628c0732cebb3b83fafb327b8"
 	mylibdir="lib64"
 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	distfiles="http://download.brother.com/welcome/dlf006641/brscan3-${version}-4.i386.deb"
-	checksum="3d2c8aace27a694c0984c6a1913fb2ebbd6cfd7a46bcdce3d54ae3693009d835"
-	debpkgid="4.i386"
+	debpkgid="1.i386"
+	distfiles="http://download.brother.com/welcome/dlf006641/brscan3-${version}-${debpkgid}.deb"
+	checksum="ad06665cac32035893f614d9305dabf73145af454f1aeb6b8b7c7fa2700fe2e6"
 	mylibdir="lib"
 fi
 
@@ -41,4 +44,22 @@ 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/
+	vlicense LICENSE
+}
+
+post_extract() {
+	curl -sk https://support.brother.com/g/s/agreement/English_lpr/agree.html | \
+		sed -n \
+			-e 's,</\?p>,,' \
+			-e 's/\&quot;/"/g' \
+			-e 's, \?^M,,' \
+			-e 's,^[ \t]\+,,' \
+			-e '14,18p' \
+			-e '28,45p' \
+		> LICENSE
+
+	filesum="$(xbps-digest LICENSE)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for LICENSE:\n$filesum\n"
+	fi
 }

From 793995788861215cdedc0ac19dcc5a4937e65d4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:22:16 -0400
Subject: [PATCH 0285/2024] python3-Pillow: update to 8.2.0.

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

diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index 4f6757ef4a03..379e7add3856 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=8.1.2
+version=8.2.0
 revision=1
 wrksrc="Pillow-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="custom:PIL"
 homepage="https://python-pillow.org"
 changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=b07c660e014852d98a00a91adfbe25033898a9d90a8f39beb2437d22a203fc44
+checksum=a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1
 
 do_check() {
 	PYTHONPATH=$(cd build/lib.linux-* && pwd) python3 -m pytest

From fde59020e00a48850c78236997bbb620badbe10e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:23:13 -0400
Subject: [PATCH 0286/2024] python3-breathe: update to 4.28.0.

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

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index 35c19a0b8e67..c4c3550b3a68 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
-version=4.27.0
+version=4.28.0
 revision=1
 wrksrc="breathe-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/michaeljones/breathe"
 changelog="https://raw.githubusercontent.com/michaeljones/breathe/master/README.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=21fe14b241fe8596f008e799706e2c5f15371bb3325fabdf4b6aab8e60e8c59f
+checksum=6948cf4700582c5b7115940367c87f74fbc4510b0a7db67fbcb5165181a784ad
 
 post_install() {
 	vlicense LICENSE

From 4c1a0a4eff2e67a7abba49c15e5ebf6c40eaaa3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:24:42 -0400
Subject: [PATCH 0287/2024] python3-matplotlib: update to 3.4.1.

---
 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 9319a10f0fac..43c126fc4811 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.0
+version=3.4.1
 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=a145cd4ec257fd659c4950a4485a860836f1ad615add756a4dcb203fad80c4cb
+checksum=e662bdde3f493b0f14f658095d91c36521d0f2d96c0a4b9fad55fca6d6300a87
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From 2cc7b768295620e46160999c2ff507fd470aaf05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:25:24 -0400
Subject: [PATCH 0288/2024] python3-parso: update to 0.8.2.

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

diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template
index bdca7f917155..c4406bc39bed 100644
--- a/srcpkgs/python3-parso/template
+++ b/srcpkgs/python3-parso/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-parso'
 pkgname=python3-parso
-version=0.8.1
+version=0.8.2
 revision=1
 wrksrc="parso-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/davidhalter/parso"
 distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e
+checksum=12b83492c6239ce32ff5eed6d3639d6a536170723c6f3f1506869f1ace413398
 
 post_install() {
 	vlicense LICENSE.txt

From e2b549892b37fc2360499f73f00c48aceffd6df0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:25:51 -0400
Subject: [PATCH 0289/2024] python3-tifffile: update to 2021.3.31.

---
 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 b4b4f3673988..821635e7d88c 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.3.17
+version=2021.3.31
 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=dd21b981a0d42f4847de5bd4e52a00c0718fdf8a26d1cb5c00a6d678e6d1e779
+checksum=82ce2f4f4d49415e95ae03f839f84eae4018435051106a1223e8b85d1a27b6f4
 # Tests require unpackaged fsspec
 make_check=no
 

From 12d0380871c58935988fb770c542d446dc591035 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:30:11 -0400
Subject: [PATCH 0290/2024] protobuf26: update to 3.15.7.

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

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index e21142f3fac8..8e8cfbe6bece 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.6
+version=3.15.7
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=65e020a42bdab44a66664d34421995829e9e79c60e5adaa08282fd14ca552f57
+checksum=efdd6b932a2c0a88a90c4c80f88e4b2e1bf031e7514dbb5a5db5d0bf4f295504
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From 40b5bf8dce8225341c841e8297e38e138ecd5401 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:34:02 -0400
Subject: [PATCH 0291/2024] python3-protobuf: update to 3.15.7.

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

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index f987b0238757..1a61e9218f75 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.15.6
+version=3.15.7
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=2b974519a2ae83aa1e31cff9018c70bbe0e303a46a598f982943c49ae1d4fcd3
+checksum=2d03fc2591543cd2456d0b72230b50c4519546a8d379ac6fd3ecd84c6df61e5d
 
 build_options="cppext"
 build_options_default="cppext"

From c49f7ffce7467c7216eb1173f7cf90a08c8112fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:41:31 -0400
Subject: [PATCH 0292/2024] python3-hypothesis: update to 6.8.4.

---
 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 474b9fb2ccf9..587e6b28d8c2 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.8.3
+version=6.8.4
 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=2fcdfa36306b944164326e9e7e3d29926c9521b3618e2b8bfa099f4cf1a3d9e1
+checksum=8ce759ea4c1792ce0456353a2f2ef0061323545ce4cf010ae8a65966304523bf
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From aaa1d11752205578bb8c56e305d7f8dd239f6ef6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:42:37 -0400
Subject: [PATCH 0293/2024] python3-pytools: update to 2021.2.2.

---
 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 fe9083a702f4..2d679f9f9a93 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.1
+version=2021.2.2
 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=ebbcc38c7a30b1a0ce1a74816c85db9f2556bb4d5b9a71f85f5d88f69ddcb96b
+checksum=7d3c37714c0ccdfe40296f526927735080e9defb8e09dd3d438e5328badadf14
 
 post_install() {
 	vlicense LICENSE

From 6345b2929747f065ee348f0b317b561fe2614ec8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:43:42 -0400
Subject: [PATCH 0294/2024] python3-pyopencl: update to 2021.1.5.

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

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 3a1d79ac75bb..811a5ca6290d 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2021.1.4
+version=2021.1.5
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=6a9665e89c15e1c684789263bd3a632567e7c7bd25a657092df4b185b3468971
+checksum=aaa438b87fbb6d5a185b22666ad0ada5f396a0ac259db95a59620e7900d3b837
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From 186e7f1070594a5bbca2cffac2b8fdf0341906d1 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, 15 Mar 2021 08:07:16 +0700
Subject: [PATCH 0295/2024] amdvlk: allow CMAKE_BUILD_TYPE=None

---
 .../patches/cmake-build-type-none.patch       | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 srcpkgs/amdvlk/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..7a629e58548e
--- /dev/null
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -0,0 +1,60 @@
+Index: llvm-project/llvm/CMakeLists.txt
+===================================================================
+--- llvm-project/llvm/CMakeLists.txt.orig
++++ llvm-project/llvm/CMakeLists.txt
+@@ -251,11 +251,6 @@ endif()
+ 
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+ 
+-if (CMAKE_BUILD_TYPE AND
+-    NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-  message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-endif()
+-
+ 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
+===================================================================
+--- pal/cmake/Modules/AmdCmakeHelper.cmake.orig
++++ 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
+===================================================================
+--- xgl/CMakeLists.txt.orig
++++ xgl/CMakeLists.txt
+@@ -181,11 +181,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/icd/CMakeLists.txt
+===================================================================
+--- xgl/icd/CMakeLists.txt.orig
++++ xgl/icd/CMakeLists.txt
+@@ -84,7 +84,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Cl
+     endif()
+ 
+     if(CMAKE_BUILD_TYPE_RELEASE)
+-        target_compile_options(xgl PRIVATE -O3)
+         if(XGL_ENABLE_LTO)
+             if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+                 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)

From f4daf1fb2db3667ef2a5f9df2d34aff268be1c10 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, 17 Mar 2021 06:24:04 +0700
Subject: [PATCH 0296/2024] eigen*: set CMAKE_BUILD_TYPE to Release

We're going to set default CMAKE_BUILD_TYPE to None soon. Those packages
are header only libraries, no need to waste time on patching.
---
 srcpkgs/eigen/template    | 1 +
 srcpkgs/eigen3.2/template | 1 +
 2 files changed, 2 insertions(+)

diff --git a/srcpkgs/eigen/template b/srcpkgs/eigen/template
index ee825e95f273..072228c16915 100644
--- a/srcpkgs/eigen/template
+++ b/srcpkgs/eigen/template
@@ -3,6 +3,7 @@ pkgname=eigen
 version=3.3.9
 revision=1
 build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
 short_desc="C++ template library for linear algebra (version 3.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
diff --git a/srcpkgs/eigen3.2/template b/srcpkgs/eigen3.2/template
index 5715fc1b3a19..7b710534b5e5 100644
--- a/srcpkgs/eigen3.2/template
+++ b/srcpkgs/eigen3.2/template
@@ -4,6 +4,7 @@ version=3.2.10
 revision=3
 wrksrc="eigen-${version}"
 build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
 short_desc="C++ template library for linear algebra (version 3.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"

From 11a97abae3ae985eb2ace734adfe663cebd30d51 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, 17 Mar 2021 07:04:48 +0700
Subject: [PATCH 0297/2024] embree: don't ignore CXXFLAGS, fix build with ispc
 1.13+

---
 .../embree/patches/uintNN-is-part-of-ispc-1.13.patch | 12 ++++++++++++
 srcpkgs/embree/template                              |  6 ++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch

diff --git a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch b/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
new file mode 100644
index 000000000000..5d0b02f3b2e5
--- /dev/null
+++ b/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
@@ -0,0 +1,12 @@
+Index: embree-2.17.7/tutorials/common/common.isph
+===================================================================
+--- embree-2.17.7.orig/tutorials/common/common.isph
++++ embree-2.17.7/tutorials/common/common.isph
+@@ -16,7 +16,3 @@
+ 
+ #pragma once
+ 
+-typedef unsigned int64 uint64;
+-typedef unsigned int32 uint32;
+-typedef unsigned int16 uint16;
+-typedef unsigned int8  uint8;
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 0bc72f46b6d8..849ec3c26c1d 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -4,6 +4,7 @@ version=2.17.7
 revision=2
 archs="x86_64"
 build_style=cmake
+configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
 makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
  libopenexr-devel libjpeg-turbo-devel libmagick-devel"
@@ -13,10 +14,7 @@ license="Apache-2.0"
 homepage="https://embree.github.io/"
 distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
 checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
-
-nopie=y
-
-configure_args="-DTBB_ROOT=/usr -DENABLE_TUTORIALS=OFF"
+patch_args=-Np1
 
 embree-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 12c6c9d3d6cbdb3199763d88dd1340f7a12582cf 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, 17 Mar 2021 07:35:19 +0700
Subject: [PATCH 0298/2024] ettercap: remove libressl patch,
 CMAKE_BUILD_TYPE=None

---
 .../patches/allow-build-type-none.patch       | 24 ++++++++++++++
 srcpkgs/ettercap/patches/libressl.patch       | 31 -------------------
 srcpkgs/ettercap/template                     |  9 ++++--
 3 files changed, 31 insertions(+), 33 deletions(-)
 create mode 100644 srcpkgs/ettercap/patches/allow-build-type-none.patch
 delete mode 100644 srcpkgs/ettercap/patches/libressl.patch

diff --git a/srcpkgs/ettercap/patches/allow-build-type-none.patch b/srcpkgs/ettercap/patches/allow-build-type-none.patch
new file mode 100644
index 000000000000..324d75086b05
--- /dev/null
+++ b/srcpkgs/ettercap/patches/allow-build-type-none.patch
@@ -0,0 +1,24 @@
+Index: ettercap-0.8.3.1/CMakeLists.txt
+===================================================================
+--- ettercap-0.8.3.1.orig/CMakeLists.txt
++++ ettercap-0.8.3.1/CMakeLists.txt
+@@ -22,19 +22,6 @@ option(LIBRARY_BUILD "Build for libetter
+ option(INSTALL_DESKTOP "Install ettercap desktop files" ON)
+ 
+ 
+-set(VALID_BUILD_TYPES Debug Release RelWithDebInfo)
+-
+-if(NOT CMAKE_BUILD_TYPE)
+-  # Default to using "Release" as our build type.
+-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING
+-    "Choose the type of build, options are: ${VALID_BUILD_TYPES}." FORCE)
+-endif()
+-list(FIND VALID_BUILD_TYPES ${CMAKE_BUILD_TYPE} contains_valid)
+-if(contains_valid EQUAL -1)
+-  message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: '${CMAKE_BUILD_TYPE}'. Valid options are: ${VALID_BUILD_TYPES}")
+-endif()
+-unset(contains_valid)
+-
+ include(CMakeDependentOption)
+ 
+ # If SYSTEM_LIBS is set to off, then all SYSTEM_* options will be
diff --git a/srcpkgs/ettercap/patches/libressl.patch b/srcpkgs/ettercap/patches/libressl.patch
deleted file mode 100644
index 15e0d3c1c9e7..000000000000
--- a/srcpkgs/ettercap/patches/libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b2f7634c9dbc0ef68640f0571787d92300e9f9f9 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan@steils.org>
-Date: Sat, 15 Aug 2020 07:18:31 +0300
-Subject: [PATCH] ec_sslwrap: fix compilation with LibreSSL
-
-Disable taking over SNI extension from ClientHello and SSL configuration
-operations until LibreSSL supports the required API.
-
-Fixes: https://github.com/Ettercap/ettercap/issues/1068
----
- src/ec_sslwrap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git src/ec_sslwrap.c src/ec_sslwrap.c
-index b9f26a142..1e4c24fc1 100644
---- src/ec_sslwrap.c
-+++ src/ec_sslwrap.c
-@@ -71,11 +71,11 @@
- #define TLS_server_method SSLv23_server_method
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_OPENSSL_1_1_0
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_OPENSSL_1_1_1
- #endif
- 
diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 7fe4c340a079..611b4e9aded7 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -3,8 +3,8 @@ pkgname=ettercap
 version=0.8.3.1
 revision=2
 build_style=cmake
-configure_args="-DENABLE_GTK=OFF"
-hostmakedepends="flex"
+configure_args="-DENABLE_GTK=OFF -DBUNDLED_LIBS=OFF"
+hostmakedepends="flex pkg-config"
 makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
@@ -15,5 +15,10 @@ homepage="http://ettercap.github.com/ettercap/"
 distfiles="https://github.com/Ettercap/ettercap/archive/v${version}.tar.gz"
 checksum=d0c3ef88dfc284b61d3d5b64d946c1160fd04276b448519c1ae4438a9cdffaf3
 lib32disabled=yes
+patch_args=-Np1
 
 CFLAGS="-fcommon"
+
+post_extract() {
+	rm -rf bundled_deps
+}

From 5d071d89f611ea5fc5a64a0a5ff640b3e2ef7fb5 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, 17 Mar 2021 08:27:10 +0700
Subject: [PATCH 0299/2024] injeqt: disable coverage

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

diff --git a/srcpkgs/injeqt/template b/srcpkgs/injeqt/template
index 1e5777fc0f18..78eba09a0249 100644
--- a/srcpkgs/injeqt/template
+++ b/srcpkgs/injeqt/template
@@ -3,7 +3,8 @@ pkgname=injeqt
 version=1.2.0
 revision=2
 build_style=cmake
-hostmakedepends="pkg-config"
+configure_args="-DDISABLE_COVERAGE=ON"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Dependency injection framework for Qt"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -12,9 +13,6 @@ homepage="https://github.com/vogel/injeqt/"
 distfiles="https://github.com/vogel/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=77540cedb0b26affe993dd18124d796059e34c80a51d9ae6433fdff1860db135
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
 CXXFLAGS="-fno-lifetime-dse -Wno-error=cast-align"
 
 injeqt-devel_package() {

From 19d0bd571a0522bca17716408f0abf1a61afa2b0 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, 17 Mar 2021 22:26:37 +0700
Subject: [PATCH 0300/2024] kindd: build with CMAKE_BUILD_TYPE=None

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

diff --git a/srcpkgs/kindd/template b/srcpkgs/kindd/template
index e634b0f69bf6..4416041de58c 100644
--- a/srcpkgs/kindd/template
+++ b/srcpkgs/kindd/template
@@ -15,7 +15,7 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=e596f1b1577ff3e83a779e6181252ae2f09731f513d17dd6b95cbc2cf204654f
 
 do_install() {
-	vbin release/kindd
+	vbin build/core/kindd
 	vinstall assets/appconf/kindd.svg 644 usr/share/pixmaps
 	vinstall assets/appconf/kindd.desktop 644 usr/share/applications
 }

From f10937be7bc47b3eccce12647ec6ba90c750d486 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, 18 Mar 2021 23:58:53 +0700
Subject: [PATCH 0301/2024] occt: allow CMAKE_BUILD_TYPE=None

---
 srcpkgs/occt/patches/cmake-build-type-none.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..acb06fb55766
--- /dev/null
+++ b/srcpkgs/occt/patches/cmake-build-type-none.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
+ 
+ set (CMAKE_SUPPRESS_REGENERATION TRUE)
+ 
+-set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
++set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
+ 
+ # macro: include patched file if it exists
+ macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)

From 4c3d44b0c9d5a2da22d30e8507740f9f442d253d 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, 19 Mar 2021 23:07:05 +0700
Subject: [PATCH 0302/2024] renderdoc: devendor zstd, lz4

---
 .../patches/build-type-none-is-release.patch  | 12 ++++
 .../renderdoc/patches/qmake-no-rpath.patch    | 13 ++++
 .../renderdoc/patches/unvendor-zstd-lz4.patch | 68 +++++++++++++++++++
 srcpkgs/renderdoc/template                    | 15 ++--
 4 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/renderdoc/patches/build-type-none-is-release.patch
 create mode 100644 srcpkgs/renderdoc/patches/qmake-no-rpath.patch
 create mode 100644 srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch

diff --git a/srcpkgs/renderdoc/patches/build-type-none-is-release.patch b/srcpkgs/renderdoc/patches/build-type-none-is-release.patch
new file mode 100644
index 000000000000..f16b944bc12c
--- /dev/null
+++ b/srcpkgs/renderdoc/patches/build-type-none-is-release.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -315,6 +315,7 @@ set(RELEASE_MODE 0)
+ 
+ if(cmake_build_type_lower STREQUAL "release" OR
+    cmake_build_type_lower STREQUAL "relwithdebinfo" OR
++   cmake_build_type_lower STREQUAL "none" OR
+    cmake_build_type_lower STREQUAL "minsizerel")
+     add_definitions(-D_RELEASE)
+     message(STATUS "Building RenderDoc in Release mode: ${CMAKE_BUILD_TYPE}")
diff --git a/srcpkgs/renderdoc/patches/qmake-no-rpath.patch b/srcpkgs/renderdoc/patches/qmake-no-rpath.patch
new file mode 100644
index 000000000000..6e6325c53555
--- /dev/null
+++ b/srcpkgs/renderdoc/patches/qmake-no-rpath.patch
@@ -0,0 +1,13 @@
+Index: qrenderdoc/CMakeLists.txt
+===================================================================
+--- qrenderdoc/CMakeLists.txt.orig
++++ qrenderdoc/CMakeLists.txt
+@@ -144,7 +144,7 @@ endif()
+ # and finding dependencies from the cmake build
+ file(WRITE
+      ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
+-     "CONFIG+=${QMAKE_CONFIG}\n"
++     "CONFIG+=${QMAKE_CONFIG} no_qt_rpath\n"
+      "\n"
+      "QMAKE_CC=${CMAKE_C_COMPILER}\n"
+      "QMAKE_CXX=${CMAKE_CXX_COMPILER}\n"
diff --git a/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch b/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch
new file mode 100644
index 000000000000..d4003ded9161
--- /dev/null
+++ b/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch
@@ -0,0 +1,68 @@
+Index: renderdoc/CMakeLists.txt
+===================================================================
+--- renderdoc/CMakeLists.txt.orig
++++ renderdoc/CMakeLists.txt
+@@ -213,54 +213,10 @@ set(sources
+     3rdparty/pugixml/pugixml.cpp
+     3rdparty/pugixml/pugixml.hpp
+     3rdparty/pugixml/pugiconfig.hpp
+-    3rdparty/lz4/lz4.c
+-    3rdparty/lz4/lz4.h
+     3rdparty/miniz/miniz.c
+     3rdparty/miniz/miniz.h
+     3rdparty/superluminal/superluminal.cpp
+     3rdparty/superluminal/superluminal.h
+-    3rdparty/zstd/bitstream.h
+-    3rdparty/zstd/compiler.h
+-    3rdparty/zstd/cpu.h
+-    3rdparty/zstd/debug.c
+-    3rdparty/zstd/debug.h
+-    3rdparty/zstd/entropy_common.c
+-    3rdparty/zstd/error_private.c
+-    3rdparty/zstd/error_private.h
+-    3rdparty/zstd/fse.h
+-    3rdparty/zstd/fse_compress.c
+-    3rdparty/zstd/fse_decompress.c
+-    3rdparty/zstd/hist.c
+-    3rdparty/zstd/hist.h
+-    3rdparty/zstd/huf.h
+-    3rdparty/zstd/huf_compress.c
+-    3rdparty/zstd/huf_decompress.c
+-    3rdparty/zstd/mem.h
+-    3rdparty/zstd/pool.c
+-    3rdparty/zstd/pool.h
+-    3rdparty/zstd/threading.c
+-    3rdparty/zstd/threading.h
+-    3rdparty/zstd/xxhash.c
+-    3rdparty/zstd/xxhash.h
+-    3rdparty/zstd/zstd.h
+-    3rdparty/zstd/zstd_common.c
+-    3rdparty/zstd/zstd_compress.c
+-    3rdparty/zstd/zstd_compress_internal.h
+-    3rdparty/zstd/zstd_decompress.c
+-    3rdparty/zstd/zstd_double_fast.c
+-    3rdparty/zstd/zstd_double_fast.h
+-    3rdparty/zstd/zstd_errors.h
+-    3rdparty/zstd/zstd_fast.c
+-    3rdparty/zstd/zstd_fast.h
+-    3rdparty/zstd/zstd_internal.h
+-    3rdparty/zstd/zstd_lazy.c
+-    3rdparty/zstd/zstd_lazy.h
+-    3rdparty/zstd/zstd_ldm.c
+-    3rdparty/zstd/zstd_ldm.h
+-    3rdparty/zstd/zstd_opt.c
+-    3rdparty/zstd/zstd_opt.h
+-    3rdparty/zstd/zstdmt_compress.c
+-    3rdparty/zstd/zstdmt_compress.h
+     3rdparty/stb/stb_image.h
+     3rdparty/stb/stb_image_write.h
+     3rdparty/stb/stb_image_resize.h
+@@ -271,6 +227,8 @@ set(sources
+     3rdparty/tinyfiledialogs/tinyfiledialogs.c
+     3rdparty/tinyfiledialogs/tinyfiledialogs.h)
+ 
++list(APPEND RDOC_LIBRARIES -llz4 -lzstd)
++
+ if(ANDROID)
+     list(APPEND sources
+         data/embedded_files.h
diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index 7240e9ebc307..4615d45c52c9 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -1,13 +1,14 @@
 # Template file for 'renderdoc'
 pkgname=renderdoc
 version=1.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON
  -DENABLE_RENDERDOCCMD=ON -DENABLE_VULKAN=ON -DENABLE_XCB=ON -DENABLE_XLIB=ON
  -DENABLE_PYRENDERDOC=ON"
-hostmakedepends="bison autoconf automake pkg-config python3"
+hostmakedepends="bison autoconf automake pkg-config python3 swig"
 makedepends="libX11-devel libxcb-devel xcb-util-keysyms-devel qt5-devel
+ libzstd-devel liblz4-devel
  qt5-svg-devel qt5-x11extras-devel pcre-devel python3-devel"
 short_desc="Stand-alone graphics debugging tool for Vulkan and OpenGL"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
@@ -19,19 +20,14 @@ checksum=4dece1b4cb859a76533b28fcd50e17321acfaa81c3435500a006c4a5ba15fddb
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
 	LDLIBS="-lexecinfo"
+	broken="uses RTLD_DL_LINKMAP, RTLD_DEEPBIND, _r_debug"
 fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="uses RTLD_DL_LINKMAP, RTLD_DEEPBIND, _r_debug" ;;
-esac
-
-if [ "$CROSS_BUILD" ]; then
-	broken="Cross-compilation can't find python3 interpreter"
-fi
+nocross="Cross-compilation can't find python3 interpreter"
 
 post_patch() {
 	[ -z "$XBPS_TARGET_NO_ATOMIC8" ] && return 0
@@ -40,4 +36,5 @@ post_patch() {
 
 post_install() {
 	vlicense LICENSE.md
+	vlicense docs/credits_acknowledgements.rst
 }

From 2ef2c6ac181e6f8f638e52909308929668abdd0f 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, 20 Mar 2021 00:47:52 +0700
Subject: [PATCH 0303/2024] python3-occ: build with CMAKE_BUILD_TYPE=None

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

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 705f37457943..3ea0ef5e6387 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -5,6 +5,7 @@ revision=1
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 wrksrc="pythonocc-core-${version}"
 build_style=cmake
+configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
 hostmakedepends="python3 swig"
 makedepends="python3-devel occt-devel freetype-devel swig"
 depends="python3 occt freetype"

From 73f5a4bc44a2c3b13a1822650554fae3dece5584 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, 19 Mar 2021 23:38:10 +0700
Subject: [PATCH 0304/2024] widelands: allow CMAKE_BUILD_TYPE=None

---
 srcpkgs/widelands-data                        |  1 -
 .../patches/cmake-build-type-none.patch       | 63 +++++++++++++++++++
 .../widelands/patches/fix-install-path.patch  | 40 ++++++++++++
 srcpkgs/widelands/template                    | 21 +------
 4 files changed, 105 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/widelands-data
 create mode 100644 srcpkgs/widelands/patches/cmake-build-type-none.patch
 create mode 100644 srcpkgs/widelands/patches/fix-install-path.patch

diff --git a/srcpkgs/widelands-data b/srcpkgs/widelands-data
deleted file mode 120000
index e9fbf89517f2..000000000000
--- a/srcpkgs/widelands-data
+++ /dev/null
@@ -1 +0,0 @@
-widelands
\ No newline at end of file
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..3d210854741b
--- /dev/null
+++ b/srcpkgs/widelands/patches/cmake-build-type-none.patch
@@ -0,0 +1,63 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
+   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+   option(OPTION_ASAN "Build with AddressSanitizer" ON)
+ else()
+-  message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
++  set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ endif()
+ 
+ wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
+@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
+ install (
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
+   DESTINATION ${WL_INSTALL_BASEDIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug
+   COMPONENT CoreVersionFile
+ )
+ 
+@@ -378,7 +378,6 @@ install(
+     data/txts
+     data/world
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
+   COMPONENT CoreDataFiles
+ )
+ 
+@@ -386,7 +385,6 @@ install(
+   DIRECTORY
+     data/maps
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
+   COMPONENT MapFiles
+ )
+ 
+@@ -395,7 +393,6 @@ install(
+     data/music
+     data/sound
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
+   COMPONENT MusicFiles
+ )
+ 
+@@ -405,7 +402,7 @@ install(
+     CREDITS
+     ChangeLog
+   DESTINATION ${WL_INSTALL_BASEDIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug
+   COMPONENT CoreLicenseFiles
+ )
+ 
+@@ -424,7 +421,6 @@ install(
+   DIRECTORY
+     ${CMAKE_CURRENT_BINARY_DIR}/locale/
+   DESTINATION ${WL_INSTALL_DATADIR}/locale
+-  CONFIGURATIONS Debug;Release
+   COMPONENT CoreLanguageFiles
+ )
+ 
diff --git a/srcpkgs/widelands/patches/fix-install-path.patch b/srcpkgs/widelands/patches/fix-install-path.patch
new file mode 100644
index 000000000000..6bb461389f03
--- /dev/null
+++ b/srcpkgs/widelands/patches/fix-install-path.patch
@@ -0,0 +1,40 @@
+Index: cmake/WlFunctions.cmake
+===================================================================
+--- cmake/WlFunctions.cmake.orig
++++ cmake/WlFunctions.cmake
+@@ -289,5 +289,5 @@ function(wl_binary NAME)
+ 
+   #Quoting the CMake documentation on DESTINATION:
+   #"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX"
+-  install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles)
++  install(TARGETS ${NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ExecutableFiles)
+ endfunction()
+Index: xdg/CMakeLists.txt
+===================================================================
+--- xdg/CMakeLists.txt.orig
++++ xdg/CMakeLists.txt
+@@ -6,19 +6,19 @@ set(XDG_APPLICATION_ID "org.widelands.Wi
+ list(APPEND icon_sizes "16" "32" "48" "64" "128")
+ foreach (icon_size ${icon_sizes})
+   #install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
+-  install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ../share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
++  install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
+ endforeach (icon_size ${icon_sizes})
+ #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6           DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6           DESTINATION ../share/man/man6)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6           DESTINATION share/man/man6)
+ #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop     DESTINATION ../share/applications)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop     DESTINATION share/applications)
+ #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ../share/metainfo)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION share/metainfo)
+ 
+ find_program(GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache)
+ if (GTK_UPDATE_ICON_CACHE)
+   #install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor ||: )")
+-  install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/../share/icons/hicolor ||: )")
++  install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor ||: )")
+ else (GTK_UPDATE_ICON_CACHE)
+   message(WARNING "gtk-update-icon-cache not found!")
+ endif (GTK_UPDATE_ICON_CACHE)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 6cee85087ea7..cfa2c10993e0 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=3
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -10,13 +10,13 @@ hostmakedepends="python3 pkg-config gettext"
 makedepends="boost-devel icu-devel minizip-devel gettext-devel
  glu-devel glew-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
  SDL2_net-devel SDL2_mixer-devel SDL2_ttf-devel"
-depends="${pkgname}-data-${version}_${revision}"
 short_desc="Real-time strategy game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.widelands.org/"
 distfiles="https://github.com/widelands/widelands/archive/build${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357
+replaces="widelands-data>=0"
 
 CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
 
@@ -29,22 +29,5 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_install() {
-	# For some reason the binary is installed as /usr/widelands - move it
-	vmkdir usr/bin
-	mv ${DESTDIR}/usr/${pkgname} ${DESTDIR}/usr/bin
-	vmkdir usr/share
-	mv ${DESTDIR}/share/* ${DESTDIR}/usr/share/
-	rmdir ${DESTDIR}/share
-
-	# Remove files not needed in the package
-	rm -f ${DESTDIR}/usr/COPYING ${DESTDIR}/usr/CREDITS ${DESTDIR}/usr/ChangeLog ${DESTDIR}/usr/VERSION
-
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 }
-
-widelands-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/widelands
-	}
-}

From 00f9f7e1b97b4eaccfd6e2b291bcbd1b6eae6cfc 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, 20 Mar 2021 09:49:25 +0700
Subject: [PATCH 0305/2024] zziplib: fix SONAME when build with
 -DCMAKE_BUILD_TYPE=None

---
 .../cmake-build-type-none-soname.patch        | 35 +++++++++++++++++++
 srcpkgs/zziplib/template                      |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 srcpkgs/zziplib/patches/cmake-build-type-none-soname.patch

diff --git a/srcpkgs/zziplib/patches/cmake-build-type-none-soname.patch b/srcpkgs/zziplib/patches/cmake-build-type-none-soname.patch
new file mode 100644
index 000000000000..2d31b5b8a46a
--- /dev/null
+++ b/srcpkgs/zziplib/patches/cmake-build-type-none-soname.patch
@@ -0,0 +1,35 @@
+Index: zziplib-0.13.72/zzip/CMakeLists.txt
+===================================================================
+--- zziplib-0.13.72.orig/zzip/CMakeLists.txt
++++ zziplib-0.13.72/zzip/CMakeLists.txt
+@@ -190,15 +190,18 @@ target_include_directories (libzzipmmapp
+ endif()
+ 
+ set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" RELEASE_POSTFIX "-${RELNUM}")
++set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" NONE_POSTFIX "-${RELNUM}")
+ SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ 
+ if(ZZIPFSEEKO)
+ set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" RELEASE_POSTFIX "-${RELNUM}")
++set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" NONE_POSTFIX "-${RELNUM}")
+ SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ endif()
+ 
+ if(ZZIPMMAPPED)
+ set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEASE_POSTFIX "-${RELNUM}")
++set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" NONE_POSTFIX "-${RELNUM}")
+ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ endif()
+ 
+Index: zziplib-0.13.72/zzipwrap/CMakeLists.txt
+===================================================================
+--- zziplib-0.13.72.orig/zzipwrap/CMakeLists.txt
++++ zziplib-0.13.72/zzipwrap/CMakeLists.txt
+@@ -49,6 +49,7 @@ target_link_libraries(libzzipwrap libzzi
+ target_include_directories(libzzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+ set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap" RELEASE_POSTFIX "-${RELNUM}")
++set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap" NONE_POSTFIX "-${RELNUM}")
+ SET_TARGET_PROPERTIES(libzzipwrap PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ set_target_properties(libzzipwrap PROPERTIES DEFINE_SYMBOL "libzzip_EXPORTS")
+ 
diff --git a/srcpkgs/zziplib/template b/srcpkgs/zziplib/template
index ab5af234af62..2026f3e4a521 100644
--- a/srcpkgs/zziplib/template
+++ b/srcpkgs/zziplib/template
@@ -12,6 +12,7 @@ homepage="https://github.com/gdraheim/zziplib"
 changelog="https://raw.githubusercontent.com/gdraheim/zziplib/master/ChangeLog"
 distfiles="https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"
 checksum=93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc
+patch_args=-Np1
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DZZIPTEST=OFF"

From 11c920e962e1d239389c8c819774fb8f3921c856 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, 21 Mar 2021 15:28:04 +0700
Subject: [PATCH 0306/2024] mellowplayer: fix build

---
 srcpkgs/mellowplayer/patches/no-werror.patch | 13 +++++++++++++
 srcpkgs/mellowplayer/template                | 13 +++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/mellowplayer/patches/no-werror.patch

diff --git a/srcpkgs/mellowplayer/patches/no-werror.patch b/srcpkgs/mellowplayer/patches/no-werror.patch
new file mode 100644
index 000000000000..7e678453a123
--- /dev/null
+++ b/srcpkgs/mellowplayer/patches/no-werror.patch
@@ -0,0 +1,13 @@
+Index: MellowPlayer-3.6.6/src/3rdparty/boost/di.hpp
+===================================================================
+--- MellowPlayer-3.6.6.orig/src/3rdparty/boost/di.hpp
++++ MellowPlayer-3.6.6/src/3rdparty/boost/di.hpp
+@@ -67,7 +67,7 @@ BOOST_DI_CFG_FWD
+ #pragma clang diagnostic error "-Wundefined-internal"
+ #pragma clang diagnostic ignored "-Wmissing-field-initializers"
+ #elif defined(__GCC__)
+-#pragma GCC diagnostic error "-Wdeprecated-declarations"
++#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+ #pragma GCC diagnostic push
+ #if (__GNUC__ < 6)
+ #pragma GCC diagnostic error "-Werror"
diff --git a/srcpkgs/mellowplayer/template b/srcpkgs/mellowplayer/template
index 2f8f13960ca6..cfd8a185556f 100644
--- a/srcpkgs/mellowplayer/template
+++ b/srcpkgs/mellowplayer/template
@@ -4,7 +4,7 @@ version=3.6.6
 revision=1
 wrksrc="MellowPlayer-${version}"
 build_style=cmake
-hostmakedepends="pkg-config qt5-tools qt5-qmake"
+hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols2-devel
  qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite
  qt5-plugin-tds qt5-plugin-odbc
@@ -17,11 +17,12 @@ license="GPL-2.0-or-later"
 homepage="https://colinduquesnoy.gitlab.io/MellowPlayer/"
 distfiles="https://gitlab.com/ColinDuquesnoy/MellowPlayer/-/archive/${version}/MellowPlayer-${version}.tar.bz2"
 checksum=17b8b25ca6b3d27b223f8be6ad80186ae5bd17ce762eb04ecd8b0e82e687b327
+patch_args=-Np1
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools"
+if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	arm*) broken="qt5-webengine not available" ;;
-esac
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi

From a74462d155d2e19e4dba42f36a73adbb257eda82 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, 21 Mar 2021 15:43:09 +0700
Subject: [PATCH 0307/2024] ispc: fix CMAKE_BUILD_TYPE=None

---
 .../ispc/patches/cmake-build-type-none.patch   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/ispc/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/ispc/patches/cmake-build-type-none.patch b/srcpkgs/ispc/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..411e353c7314
--- /dev/null
+++ b/srcpkgs/ispc/patches/cmake-build-type-none.patch
@@ -0,0 +1,18 @@
+Index: ispc-1.15.0/CMakeLists.txt
+===================================================================
+--- ispc-1.15.0.orig/CMakeLists.txt
++++ ispc-1.15.0/CMakeLists.txt
+@@ -157,13 +157,6 @@ set(OUTPUT_RELEASE Release/bin)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+ 
+ if(CMAKE_BUILD_TYPE)
+-    # Validate build type
+-    set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
+-
+-    string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+-    if (${MATCHED_CONFIG} EQUAL -1)
+-         message(FATAL_ERROR "CMAKE_BUILD_TYPE (${CMAKE_BUILD_TYPE}) allows only the following values: ${CONFIGURATION_TYPES}")
+-    endif()
+ else(NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE "Release")
+     message(STATUS "Build type not specified: Use Release by default.")

From 9947a79949ae29cd44763d69f1b0078fac5a987c 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, 21 Mar 2021 15:56:50 +0700
Subject: [PATCH 0308/2024] darktable: fix CMAKE_BUILD_TYPE=None

---
 .../darktable/patches/cmake-build-type-none.patch  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/darktable/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/darktable/patches/cmake-build-type-none.patch b/srcpkgs/darktable/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..7101f9c1a0e7
--- /dev/null
+++ b/srcpkgs/darktable/patches/cmake-build-type-none.patch
@@ -0,0 +1,14 @@
+Index: src/external/rawspeed/cmake/build-type.cmake
+===================================================================
+--- src/external/rawspeed/cmake/build-type.cmake.orig
++++ src/external/rawspeed/cmake/build-type.cmake
+@@ -27,9 +27,6 @@ string(TOUPPER "${RAWSPEED_SPECIAL_BUILD
+ 
+ # is this one of the known build types?
+ list (FIND CMAKE_CONFIGURATION_TYPES_UPPERCASE ${CMAKE_BUILD_TYPE_UPPERCASE} BUILD_TYPE_IS_KNOWN)
+-if (${BUILD_TYPE_IS_KNOWN} EQUAL -1)
+- message(SEND_ERROR "Unknown build type: ${CMAKE_BUILD_TYPE_UPPERCASE}. Please specify one of: ${CMAKE_CONFIGURATION_TYPES}")
+-endif()
+ 
+ # is this a special build?
+ list (FIND RAWSPEED_SPECIAL_BUILD_TYPES_UPPERCASE ${CMAKE_BUILD_TYPE_UPPERCASE} IS_SPECIAL_BUILD)

From 4e78fb489dc31e6a78b83a6bdbdfdaaa027a128b 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, 21 Mar 2021 15:33:29 +0700
Subject: [PATCH 0309/2024] hedgewars: merge -data back

---
 srcpkgs/hedgewars-data                        |  1 -
 .../patches/cmake-build-type-none.patch       | 30 +++++++++++++++++++
 srcpkgs/hedgewars/template                    | 23 +++++---------
 3 files changed, 38 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/hedgewars-data
 create mode 100644 srcpkgs/hedgewars/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/hedgewars-data b/srcpkgs/hedgewars-data
deleted file mode 120000
index b57dc45ebadc..000000000000
--- a/srcpkgs/hedgewars-data
+++ /dev/null
@@ -1 +0,0 @@
-hedgewars
\ No newline at end of file
diff --git a/srcpkgs/hedgewars/patches/cmake-build-type-none.patch b/srcpkgs/hedgewars/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..b4e0c186717c
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/cmake-build-type-none.patch
@@ -0,0 +1,30 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -54,7 +54,7 @@ option(NOVERSIONINFOUPDATE "Disable upda
+ 
+ 
+ if(BUILD_ENGINE_C AND NOT NOVIDEOREC)
+-    if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
++    if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+         message("NOTE: Video recorder support disabled. It's incompatible with BUILD_ENGINE_C")
+         set(BUILD_ENGINE_C ON CACHE STRING "Required for BUILD_ENGINE_JS" FORCE)
+     else()
+@@ -93,7 +93,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR 1)
+ set(CPACK_PACKAGE_VERSION_MINOR 0)
+ set(CPACK_PACKAGE_VERSION_PATCH 0)
+ set(HEDGEWARS_PROTO_VER 59)
+-if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
++if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+     set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ else()
+     set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-dev")
+@@ -114,6 +114,7 @@ include(${CMAKE_MODULE_PATH}/platform.cm
+ if(CMAKE_BUILD_TYPE)
+     if(NOT((CMAKE_BUILD_TYPE STREQUAL "Release") OR
+            (CMAKE_BUILD_TYPE STREQUAL "Debug") OR
++	   (CMAKE_BUILD_TYPE STREQUAL "None") OR
+            (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")))
+         set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE)
+         message(STATUS "Unknown build type ${CMAKE_BUILD_TYPE}, using default (${default_build_type})")
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index d2294cf572f5..aed3c03caf89 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,15 +1,16 @@
 # Template file for 'hedgewars'
 pkgname=hedgewars
 version=1.0.0
-revision=2
+revision=3
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
 configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
- -DPHYSFS_SYSTEM=1 -DCMAKE_VERBOSE_MAKEFILE=1 -DMINIMAL_FLAGS=1"
-hostmakedepends="lua51 pkg-config"
+ -DPHYSFS_SYSTEM=1 -DMINIMAL_FLAGS=1"
+make_cmd=make
+hostmakedepends="lua51 pkg-config qt5-qmake qt5-host-tools"
 makedepends="ffmpeg-devel lua51-devel physfs-devel qt5-tools-devel SDL2_image-devel
  SDL2_mixer-devel SDL2_net-devel SDL2_ttf-devel"
-depends="hedgewars-data>=${version}_${revision} libfreeglut"
+depends="libfreeglut"
 short_desc="Funny turn-based artillery game, featuring fighting Hedgehogs!"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-only"
@@ -18,10 +19,8 @@ distfiles="https://hedgewars.org/download/releases/hedgewars-src-${version}.tar.
 checksum=211634e61f2e4beecc3c98c6f749601fcd08321fda1ba969b3b3832a004f155b
 nopie_files="/usr/bin/hwengine"
 nocross="Needs investigation: fails to link hwengine"
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
+replaces="hedgewars-data>=0"
+export CMAKE_GENERATOR="Unix Makefiles"
 
 case $XBPS_TARGET_MACHINE in
 	x86_64*)
@@ -38,6 +37,7 @@ esac
 
 if [ -n "$_use_c_engine" ]; then
 	hostmakedepends+=" glew-devel libatomic-devel ghc clang"
+	makedepends+=" glew-devel libatomic-devel"
 	configure_args+=" -DBUILD_ENGINE_C=1"
 	nopie_files+=" /usr/bin/hedgewars"
 fi
@@ -56,10 +56,3 @@ pre_configure() {
 post_install() {
 	vinstall ${DESTDIR}/usr/share/hedgewars/Data/misc/hedgewars.desktop 644 usr/share/applications
 }
-
-hedgewars-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/hedgewars/Data
-	}
-}

From cf7ebfcc56d13f18262eb2d4c91b4cc540d9f9ab 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, 21 Mar 2021 16:41:58 +0700
Subject: [PATCH 0310/2024] mariadb: fix for CMAKE_BUILD_TYPE=None

---
 srcpkgs/mariadb/template | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 437ff757b383..78d5e2dbdbe8 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -34,35 +34,31 @@ replaces="mysql>=0"
 conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon"
+CFLAGS="-w -fcommon -DDBUG_OFF=1"
+CXXFLAGS="-DDBUG_OFF=1"
 
 pre_configure() {
 	# We need some host binaries before starting cross compilation.
 	if [ "$CROSS_BUILD" ]; then
+		mkdir -p build.native
 		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake .
-		make comp_err comp_sql gen_lex_hash gen_lex_token
-		mkdir bin.host
-		cp extra/comp_err bin.host
-		cp scripts/comp_sql bin.host
-		cp sql/gen_lex_hash bin.host
-		cp sql/gen_lex_token bin.host
-		make clean
-		rm CMakeCache.txt
+		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
+			cmake -S . -B build.native
+		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
 	fi
 }
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		# CMake complains if those binaries ain't in build
-		cp bin.host/comp_err ${wrksrc}/extra
-		cp bin.host/comp_err ${wrksrc}/build/extra
-		cp bin.host/comp_sql ${wrksrc}/scripts
-		cp bin.host/comp_sql ${wrksrc}/build/scripts
-		cp bin.host/gen_lex_hash ${wrksrc}/sql
-		cp bin.host/gen_lex_hash ${wrksrc}/build/sql
-		cp bin.host/gen_lex_token ${wrksrc}/sql
-		cp bin.host/gen_lex_token ${wrksrc}/build/sql
+		cp build.native/extra/comp_err ${wrksrc}/extra
+		cp build.native/extra/comp_err ${wrksrc}/build/extra
+		cp build.native/scripts/comp_sql ${wrksrc}/scripts
+		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
+		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
+		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
+		cp build.native/sql/gen_lex_token ${wrksrc}/sql
+		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
 		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
 	fi
 	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability

From 45ce27d0347967b95bfd7f42dc93ac9579d247cb 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, 25 Mar 2021 07:58:28 +0700
Subject: [PATCH 0311/2024] EternalTerminal: remove -ggdb3

---
 .../EternalTerminal/patches/fix-cflags.patch    | 17 +++++++++++++++++
 srcpkgs/EternalTerminal/template                |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/EternalTerminal/patches/fix-cflags.patch

diff --git a/srcpkgs/EternalTerminal/patches/fix-cflags.patch b/srcpkgs/EternalTerminal/patches/fix-cflags.patch
new file mode 100644
index 000000000000..e6fcd432f7e7
--- /dev/null
+++ b/srcpkgs/EternalTerminal/patches/fix-cflags.patch
@@ -0,0 +1,17 @@
+Index: EternalTerminal-et-v6.0.13/CMakeLists.txt
+===================================================================
+--- EternalTerminal-et-v6.0.13.orig/CMakeLists.txt
++++ EternalTerminal-et-v6.0.13/CMakeLists.txt
+@@ -26,12 +26,6 @@ if(DISABLE_CRASH_LOG)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DELPP_DISABLE_DEFAULT_CRASH_HANDLING")
+ ENDIF(DISABLE_CRASH_LOG)
+ 
+-if(UNIX)
+-  # Enable debug info
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ggdb3")
+-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -ggdb3")
+-endif()
+-
+ # Enable C++-11
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 7bac78d2ffd4..bc92e47743dd 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -13,6 +13,7 @@ homepage="https://eternalterminal.dev/"
 distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz"
 checksum=728c3a444d666897c710e33fe473d8d289263a59574451b13aa53ec3c6ac88b3
 system_accounts="_eternal"
+patch_args=-Np1
 
 LDFLAGS="-lgflags"
 

From fca1d34f10200d14349b2bbae0ae3523d540e372 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, 25 Mar 2021 08:20:29 +0700
Subject: [PATCH 0312/2024] OTPClient: respect CFLAGS

---
 srcpkgs/OTPClient/patches/fix-cflags.patch | 17 +++++++++++++++++
 srcpkgs/OTPClient/template                 |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch

diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
new file mode 100644
index 000000000000..ae70f441538f
--- /dev/null
+++ b/srcpkgs/OTPClient/patches/fix-cflags.patch
@@ -0,0 +1,17 @@
+Index: OTPClient-2.4.2/CMakeLists.txt
+===================================================================
+--- OTPClient-2.4.2.orig/CMakeLists.txt
++++ OTPClient-2.4.2/CMakeLists.txt
+@@ -11,11 +11,10 @@ option(BUILD_GUI "Build the GUI" ON)
+ option(BUILD_CLI "Build the CLI" ON)
+ 
+ set(CMAKE_C_STANDARD 11)
+-set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always -Wstrict-prototypes -Wunreachable-code")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Wpointer-arith -Wbad-function-cast -Wcast-align")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security -Werror=implicit-function-declaration -Wno-sign-compare")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
+ if(CMAKE_COMPILER_IS_GNUCC)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
+ endif()
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index e8c0099850b7..f5af76e655a6 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -12,3 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
 distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
 checksum=74bc4312aa1cd336ca983434e3bed951c5ead327091e7708e3beb08508813495
+patch_args=-Np1

From a7cb9f57b6a68077479d586584bff71dc8710aec 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, 25 Mar 2021 08:30:31 +0700
Subject: [PATCH 0313/2024] crex: hardening

---
 srcpkgs/crex/patches/fix-cflags.patch | 20 ++++++++++++++++++++
 srcpkgs/crex/template                 |  7 ++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/crex/patches/fix-cflags.patch

diff --git a/srcpkgs/crex/patches/fix-cflags.patch b/srcpkgs/crex/patches/fix-cflags.patch
new file mode 100644
index 000000000000..d191fb1e9ec0
--- /dev/null
+++ b/srcpkgs/crex/patches/fix-cflags.patch
@@ -0,0 +1,20 @@
+Index: crex-0.2.5/CMakeLists.txt
+===================================================================
+--- crex-0.2.5.orig/CMakeLists.txt
++++ crex-0.2.5/CMakeLists.txt
+@@ -13,9 +13,6 @@ endif(CCACHE_FOUND)
+ set (CMAKE_CXX_STANDARD 14)
+ set (CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+-set (CMAKE_CXX_FLAGS "-fdiagnostics-color=auto")
+-set (CMAKE_C_FLAGS "-fdiagnostics-color=auto")
+-
+ set (DEBUG_FLAGS "-Wpedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused -std=c++14 -g")
+ set (DEBUG_LINK_FLAGS "-fprofile-arcs -ftest-coverage -flto")
+ 
+@@ -56,4 +53,4 @@ target_link_libraries (
+   ${TARGET}
+ )
+ 
+-install (TARGETS ${TARGET} DESTINATION "/usr/local/bin")
++install (TARGETS ${TARGET} DESTINATION "/usr/bin")
diff --git a/srcpkgs/crex/template b/srcpkgs/crex/template
index a54697a93adc..2f455a0b0c72 100644
--- a/srcpkgs/crex/template
+++ b/srcpkgs/crex/template
@@ -1,7 +1,7 @@
 # Template file for 'crex'
 pkgname=crex
 version=0.2.5
-revision=1
+revision=2
 build_style=cmake
 short_desc="Explore, test, and check regular expressions in the terminal"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -9,10 +9,7 @@ license="MIT"
 homepage="https://github.com/octobanana/crex"
 distfiles="https://github.com/octobanana/crex/archive/${version}.tar.gz"
 checksum=c6a166b7a1e696a7babeaf7c5728eece1624704a18357f827129fc95ef2ecc56
-
-pre_configure() {
-	sed -e 's|/local/|/|' -i CMakeLists.txt
-}
+patch_args=-Np1
 
 post_install() {
 	vlicense LICENSE

From c23ffa6a1b0d950fa3510916f4d9edec0d949c9f 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, 25 Mar 2021 08:34:32 +0700
Subject: [PATCH 0314/2024] libbaseencode: hardening

---
 srcpkgs/libbaseencode/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/libbaseencode/template                 |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libbaseencode/patches/fix-cflags.patch

diff --git a/srcpkgs/libbaseencode/patches/fix-cflags.patch b/srcpkgs/libbaseencode/patches/fix-cflags.patch
new file mode 100644
index 000000000000..1bb86a0b15a4
--- /dev/null
+++ b/srcpkgs/libbaseencode/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: libbaseencode-1.0.9/CMakeLists.txt
+===================================================================
+--- libbaseencode-1.0.9.orig/CMakeLists.txt
++++ libbaseencode-1.0.9/CMakeLists.txt
+@@ -15,7 +15,7 @@ set(CMAKE_C_STANDARD 11)
+ set(BASEENCODE_HEADERS src/baseencode.h)
+ set(SOURCE_FILES src/base32.c src/base64.c)
+ 
+-set(CMAKE_C_FLAGS "-Wall -Werror -fPIC")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -fPIC")
+ 
+ add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
+ 
diff --git a/srcpkgs/libbaseencode/template b/srcpkgs/libbaseencode/template
index 384a189224df..d5929ad7bb51 100644
--- a/srcpkgs/libbaseencode/template
+++ b/srcpkgs/libbaseencode/template
@@ -1,7 +1,7 @@
 # Template file for 'libbaseencode'
 pkgname=libbaseencode
 version=1.0.9
-revision=1
+revision=2
 build_style=cmake
 short_desc="Library for encoding decoding data use base32 or base64"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,6 +9,7 @@ license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libbaseencode"
 distfiles="https://github.com/paolostivanin/libbaseencode/archive/v${version}.tar.gz"
 checksum=a183d7cf30d931b2a078d6f0ef64616b71ab26f9258e5f4e191778c7ace7175d
+patch_args=-Np1
 
 libbaseencode-devel_package() {
 	depends="libbaseencode-${version}_${revision}"

From 2a9a2d9fa75185c70a6b3031bda7ec79ac0d47ff 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, 26 Mar 2021 08:46:56 +0700
Subject: [PATCH 0315/2024] bibletime: clean build flags

---
 srcpkgs/bibletime/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/bibletime/template                 |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/bibletime/patches/fix-cflags.patch

diff --git a/srcpkgs/bibletime/patches/fix-cflags.patch b/srcpkgs/bibletime/patches/fix-cflags.patch
new file mode 100644
index 000000000000..480c5ca4ac1e
--- /dev/null
+++ b/srcpkgs/bibletime/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: bibletime-3.0/cmake/BTApplication.cmake
+===================================================================
+--- bibletime-3.0.orig/cmake/BTApplication.cmake
++++ bibletime-3.0/cmake/BTApplication.cmake
+@@ -41,7 +41,7 @@ IF(WIN32)
+     ADD_COMPILE_OPTIONS("/Zi")
+ ELSE()
+     ADD_COMPILE_OPTIONS(
+-        "-ggdb" "-Wall" "-Wextra"
++        "-Wall" "-Wextra" "-DNDEBUG" "-DQT_NO_DEBUG"
+         "$<$<STREQUAL:$<CONFIGURATION>,Release>:-O2>"
+         "$<$<STREQUAL:$<CONFIGURATION>,Release>:-DNDEBUG>"
+         "$<$<STREQUAL:$<CONFIGURATION>,Release>:-DQT_NO_DEBUG>"
diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index 224881c45516..85bcc7f22f87 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -18,6 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://bibletime.info"
 distfiles="https://github.com/bibletime/bibletime/releases/download/v${version}/bibletime-${version}.tar.xz"
 checksum=d6beef62ad44b255e3dc4c5e89214bf01a0e85c9136073b0be12fca3d2b22622
+patch_args=-Np1
 
 pre_build() {
 	. /etc/profile.d/10_openjdk11.sh

From af1b331e2c974d5fe1242796d1665124b9a72b5f 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, 26 Mar 2021 08:54:25 +0700
Subject: [PATCH 0316/2024] boomerang: clean build flags

---
 srcpkgs/boomerang/patches/fix-cflags.patch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/boomerang/patches/fix-cflags.patch

diff --git a/srcpkgs/boomerang/patches/fix-cflags.patch b/srcpkgs/boomerang/patches/fix-cflags.patch
new file mode 100644
index 000000000000..eb59766c1c5b
--- /dev/null
+++ b/srcpkgs/boomerang/patches/fix-cflags.patch
@@ -0,0 +1,21 @@
+Index: cmake-scripts/boomerang-flags.cmake
+===================================================================
+--- cmake-scripts/boomerang-flags.cmake
++++ cmake-scripts/boomerang-flags.cmake
+@@ -104,16 +104,6 @@ endif ()
+ 
+ 
+ if (NOT MSVC)
+-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-        BOOMERANG_ADD_COMPILE_FLAGS(-O0)
+-    elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+-        # No special flags
+-    elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
+-        BOOMERANG_ADD_COMPILE_FLAGS(-Os)
+-    else () # Release
+-        BOOMERANG_ADD_COMPILE_FLAGS(-O3)
+-    endif ()
+-
+     if (BOOMERANG_ENABLE_COVERAGE)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")

From 0167bfa3ab7f1cafbd105a21db9af382a53d1b7f 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, 26 Mar 2021 08:58:11 +0700
Subject: [PATCH 0317/2024] catimg: don't change our build-type

---
 srcpkgs/catimg/patches/fix-cflags.patch | 12 ++++++++++++
 srcpkgs/catimg/template                 |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/catimg/patches/fix-cflags.patch

diff --git a/srcpkgs/catimg/patches/fix-cflags.patch b/srcpkgs/catimg/patches/fix-cflags.patch
new file mode 100644
index 000000000000..9b9f1074ef20
--- /dev/null
+++ b/srcpkgs/catimg/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: catimg-2.7.0/CMakeLists.txt
+===================================================================
+--- catimg-2.7.0.orig/CMakeLists.txt
++++ catimg-2.7.0/CMakeLists.txt
+@@ -11,7 +11,6 @@ endif()
+ #set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -g -std=c99 -Wno-unused-result")
+ #set(CMAKE_BUILD_TYPE Debug)
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -Wextra -Os -std=c99 -Wno-unused-result")
+-set(CMAKE_BUILD_TYPE Release)
+ 
+ set(SRC ${PROJECT_SOURCE_DIR}/src)
+ 
diff --git a/srcpkgs/catimg/template b/srcpkgs/catimg/template
index 374351c45379..6fbc5f1d9140 100644
--- a/srcpkgs/catimg/template
+++ b/srcpkgs/catimg/template
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/posva/catimg"
 distfiles="https://github.com/posva/catimg/archive/${version}.tar.gz"
 checksum=3a6450316ff62fb07c3facb47ea208bf98f62abd02783e88c56f2a6508035139
-
+patch_args=-Np1
 CFLAGS="-fcommon"
 
 post_install() {

From 771dc8615cde4a562d463c0a9bb29c7c244044c3 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, 26 Mar 2021 09:09:37 +0700
Subject: [PATCH 0318/2024] libcotp: fix build flags

---
 srcpkgs/libcotp/patches/fix-cflags.patch | 14 ++++++++++++++
 srcpkgs/libcotp/template                 |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch

diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
new file mode 100644
index 000000000000..397b3960e9f4
--- /dev/null
+++ b/srcpkgs/libcotp/patches/fix-cflags.patch
@@ -0,0 +1,14 @@
+Index: libcotp-1.2.2/CMakeLists.txt
+===================================================================
+--- libcotp-1.2.2.orig/CMakeLists.txt
++++ libcotp-1.2.2/CMakeLists.txt
+@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
+ set(COTP_HEADERS src/cotp.h)
+ set(SOURCE_FILES src/otp.c)
+ 
+-set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
+ 
+ add_library(cotp SHARED ${SOURCE_FILES})
+ 
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 9e147ff7deb6..88337290d1e8 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libcotp"
 distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
 checksum=25b45ffa4aece5cc689503ebea7356a2f760c194f0c41805934495d2fe7165b1
+patch_args=-Np1
 
 libcotp-devel_package() {
 	depends="libcotp-${version}_${revision}"

From b9682959381a726a9e3c4654bebd586ed3086350 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, 26 Mar 2021 21:06:07 +0700
Subject: [PATCH 0319/2024] loudgain: hardening

---
 srcpkgs/loudgain/patches/fix-cflags.patch | 20 ++++++++++++++++++++
 srcpkgs/loudgain/template                 |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch

diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
new file mode 100644
index 000000000000..25b2c969bef4
--- /dev/null
+++ b/srcpkgs/loudgain/patches/fix-cflags.patch
@@ -0,0 +1,20 @@
+Index: loudgain-0.6.8/CMakeLists.txt
+===================================================================
+--- loudgain-0.6.8.orig/CMakeLists.txt
++++ loudgain-0.6.8/CMakeLists.txt
+@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
+ )
+ 
+ SET_TARGET_PROPERTIES(loudgain PROPERTIES
+-  COMPILE_FLAGS "-Wall -pedantic -g"
++  COMPILE_FLAGS "-Wall -pedantic"
+ )
+ 
+-SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
+ 
+-SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
+ 
+ INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ 
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
index f29167883439..00b2d20d27d6 100644
--- a/srcpkgs/loudgain/template
+++ b/srcpkgs/loudgain/template
@@ -1,7 +1,7 @@
 # Template file for 'loudgain'
 pkgname=loudgain
 version=0.6.8
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libebur128-devel taglib-devel ffmpeg-devel"
@@ -11,6 +11,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/Moonbase59/loudgain"
 distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
 checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
+patch_args=-Np1
 
 post_install() {
 	vlicense COPYING

From 7af99440bee3b15ffe231ca19e217f6cf258eb89 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, 26 Mar 2021 21:20:13 +0700
Subject: [PATCH 0320/2024] msg2: hardening

---
 srcpkgs/msg2/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/msg2/template                 |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/msg2/patches/fix-cflags.patch

diff --git a/srcpkgs/msg2/patches/fix-cflags.patch b/srcpkgs/msg2/patches/fix-cflags.patch
new file mode 100644
index 000000000000..64404bf44fcb
--- /dev/null
+++ b/srcpkgs/msg2/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -3,7 +3,7 @@ project(msg2)
+ 
+ # Flags
+ set(CMAKE_CXX_STANDARD 17)
+-set(CMAKE_CXX_FLAGS "-Os -pipe -fPIC -fno-plt -fstack-protector-strong -Wall -Wshadow -pedantic -Wno-parentheses -Wfatal-errors")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -fPIC -fno-plt -fstack-protector-strong -Wall -Wshadow -pedantic -Wno-parentheses -Wfatal-errors")
+ 
+ # Add source files
+ add_executable(msg2 main.cpp)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index b4f77400bf22..473b3c4ec4d2 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
 # Template file for 'msg2'
 pkgname=msg2
 version=1.2.0
-revision=1
+revision=2
 build_style=cmake
 short_desc="Output a blue arrow and a white message on the commandline"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f00e515c14029dd9c936a522e906054e2e7a9e57 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, 26 Mar 2021 21:22:55 +0700
Subject: [PATCH 0321/2024] ippusbxd: fix cflags -O2 not -o2

---
 srcpkgs/ippusbxd/patches/fix-cflags.patch | 12 ++++++++++++
 srcpkgs/ippusbxd/template                 |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ippusbxd/patches/fix-cflags.patch

diff --git a/srcpkgs/ippusbxd/patches/fix-cflags.patch b/srcpkgs/ippusbxd/patches/fix-cflags.patch
new file mode 100644
index 000000000000..5d36903c3ffd
--- /dev/null
+++ b/srcpkgs/ippusbxd/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.6)
+ project(ippusbxd)
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -o2 -g -std=c99 -Wall -Wextra -pedantic -pedantic-errors")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic -pedantic-errors")
+ 
+ 
+ # Compiler specific configuration
diff --git a/srcpkgs/ippusbxd/template b/srcpkgs/ippusbxd/template
index ce4ff2ea9125..e81064e8b91d 100644
--- a/srcpkgs/ippusbxd/template
+++ b/srcpkgs/ippusbxd/template
@@ -1,7 +1,7 @@
 # Template file for 'ippusbxd'
 pkgname=ippusbxd
 version=1.34
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make

From 788675121cf84f9fe7074c8db0673217e827b3e1 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, 26 Mar 2021 21:34:52 +0700
Subject: [PATCH 0322/2024] tlsh: respect -g + hardening

---
 srcpkgs/tlsh/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/tlsh/template                 |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tlsh/patches/fix-cflags.patch

diff --git a/srcpkgs/tlsh/patches/fix-cflags.patch b/srcpkgs/tlsh/patches/fix-cflags.patch
new file mode 100644
index 000000000000..8715563715c7
--- /dev/null
+++ b/srcpkgs/tlsh/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -125,7 +125,7 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug)
+     endif()
+ else(CMAKE_BUILD_TYPE STREQUAL Debug)
+     if(CMAKE_COMPILER_IS_GNUCXX)
+-        set(CMAKE_CXX_FLAGS "-O2 -fvisibility=internal")  ## Remove TlshImpl symbols
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=internal")  ## Remove TlshImpl symbols
+     endif()
+     if(MSVC)
+         set(CMAKE_CXX_FLAGS "/O2")        ## Optimize
diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template
index 1f96834107cc..4ee1ccdc728a 100644
--- a/srcpkgs/tlsh/template
+++ b/srcpkgs/tlsh/template
@@ -1,7 +1,7 @@
 # Template file for 'tlsh'
 pkgname=tlsh
 version=3.19.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-devel"

From 46209e6e9a42e8078549fafe1e9de4b995d61b20 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, 26 Mar 2021 21:59:06 +0700
Subject: [PATCH 0323/2024] poppler: hardening + respect -g

---
 srcpkgs/poppler/patches/fix-cflags.patch | 21 +++++++++++++++++++++
 srcpkgs/poppler/template                 |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/poppler/patches/fix-cflags.patch

diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
new file mode 100644
index 000000000000..9e62b11010ba
--- /dev/null
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -0,0 +1,21 @@
+Index: cmake/modules/PopplerMacros.cmake
+===================================================================
+--- cmake/modules/PopplerMacros.cmake.orig
++++ cmake/modules/PopplerMacros.cmake
+@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
++  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+   set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
++  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
+   set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+   set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+   set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index ed0db8de7ab6..1aebd7f7e177 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -4,7 +4,7 @@
 #
 pkgname=poppler
 version=20.09.0
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON

From 9bb8f6eac602c3308442b2e3cc520cf9971021f1 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, 26 Mar 2021 21:59:29 +0700
Subject: [PATCH 0324/2024] poppler-qt5: hardening + respect -g

---
 srcpkgs/poppler-qt5/patches  | 1 +
 srcpkgs/poppler-qt5/template | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/poppler-qt5/patches

diff --git a/srcpkgs/poppler-qt5/patches b/srcpkgs/poppler-qt5/patches
new file mode 120000
index 000000000000..636e4ac2cbd9
--- /dev/null
+++ b/srcpkgs/poppler-qt5/patches
@@ -0,0 +1 @@
+../poppler/patches
\ No newline at end of file
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 0dc45c05c58b..c2ec35dbbad3 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -5,7 +5,7 @@
 #
 pkgname=poppler-qt5
 version=20.09.0
-revision=1
+revision=2
 wrksrc="poppler-${version}"
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF

From 254e5482c3bda997b076727e19fe46d69b035f48 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, 27 Mar 2021 11:17:35 +0700
Subject: [PATCH 0325/2024] artyfx: remove -O1 -g

---
 srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch | 4 ++--
 srcpkgs/artyfx/patches/respect-our-cflags.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
index 1a832155a566..47ef4dd9b84e 100644
--- a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
+++ b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
@@ -6,8 +6,8 @@
  
 -SET(CMAKE_C_FLAGS   "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
 -SET(CMAKE_CXX_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
-+SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC -g") # -fsanitize=address
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g") # -fsanitize=address
++SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC") # -fsanitize=address
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # -fsanitize=address
 +
 +IF(BUILD_SSE)
 +	SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -msse -msse2 -mfpmath=sse")
diff --git a/srcpkgs/artyfx/patches/respect-our-cflags.patch b/srcpkgs/artyfx/patches/respect-our-cflags.patch
index ee9155c7729e..7a32fd9df73b 100644
--- a/srcpkgs/artyfx/patches/respect-our-cflags.patch
+++ b/srcpkgs/artyfx/patches/respect-our-cflags.patch
@@ -10,8 +10,8 @@ Index: CMakeLists.txt
 -SET(CMAKE_C_FLAGS "-g -Wall -O1 -Wno-unused-variable")
 -SET(CMAKE_CXX_FLAGS "-g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
 +SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -L./src/avtk -Wl,--no-undefined")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O1 -Wno-unused-variable")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall  -Wno-unused-variable")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall  -Wno-unused-variable -ftree-vectorize")
  
  
  # DSP sources

From 6f02e83966dcc0afd0a0c65bc3e1c3dadd433014 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, 27 Mar 2021 11:27:28 +0700
Subject: [PATCH 0326/2024] coin3: build with CMAKE_BUILD_TYPE=None

---
 srcpkgs/coin3/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/coin3/template b/srcpkgs/coin3/template
index d5483ee048c3..8f7218c2e8c3 100644
--- a/srcpkgs/coin3/template
+++ b/srcpkgs/coin3/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="coin-Coin-${version}"
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/Coin3
- -DCMAKE_BUILD_TYPE=Release -DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
+ -DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
 hostmakedepends="doxygen graphviz"
 makedepends="boost-devel glu-devel"
 short_desc="High-level 3D graphics toolkit"
@@ -15,6 +15,9 @@ homepage="https://coin3d.github.io/"
 distfiles="https://github.com/coin3d/coin/archive/Coin-${version}.tar.gz"
 checksum=b00d2a8e9d962397cf9bf0d9baa81bcecfbd16eef675a98c792f5cf49eb6e805
 
+CFLAGS=-DNDEBUG
+CXXFLAGS=-DNDEBUG
+
 if [ "$CROSS_BUILD" ]; then
 	# bypass runtime test (quote hashing is fine with gcc 9.3)
 	configure_args+=" -DHAVE_HASH_QUOTING_EXITCODE=0"

From d76fa28eed66e3d6ccc3a611af437eda77f94c91 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, 27 Mar 2021 11:46:46 +0700
Subject: [PATCH 0327/2024] conky: don't overwrite CMAKE_BUILD_TYPE

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

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 8b95a628edfb..f05c7d4a1bf2 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -5,7 +5,7 @@ version=1.12.1
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
-configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON
+configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
  -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON
  -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON
  -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON

From c68ef5a092d0cc58e2f85a173906c14862bdfa9d 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, 27 Mar 2021 11:46:46 +0700
Subject: [PATCH 0328/2024] conky-cli: don't overwrite CMAKE_BUILD_TYPE

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

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index b61bdcca0504..7d512b65ab3e 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -6,7 +6,7 @@ revision=1
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
-configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON
+configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
  -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF
  -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON
  -DBUILD_DOCS=ON"

From 6404233f50a4172c94bc113a4137ffebbeaf90d1 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, 27 Mar 2021 11:48:25 +0700
Subject: [PATCH 0329/2024] crossguid: don't overwrite -O2

---
 srcpkgs/crossguid/fix-cflags.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/crossguid/fix-cflags.patch

diff --git a/srcpkgs/crossguid/fix-cflags.patch b/srcpkgs/crossguid/fix-cflags.patch
new file mode 100644
index 000000000000..983360a07ccf
--- /dev/null
+++ b/srcpkgs/crossguid/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5.1)
+ project(CrossGuid)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+ 
+ option(XG_TESTS "Build test runner" ON)
+ 

From af4633e8d3819790176a278fdb93fa2aff323269 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, 27 Mar 2021 12:19:04 +0700
Subject: [PATCH 0330/2024] rapidjson: define -DNDEBUG

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

diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template
index 8597f8fb2706..99d92702cc9d 100644
--- a/srcpkgs/rapidjson/template
+++ b/srcpkgs/rapidjson/template
@@ -11,7 +11,7 @@ distfiles="https://github.com/miloyip/${pkgname}/archive/v${version}.tar.gz"
 checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
 
 # class-memaccess is required by https://github.com/Tencent/rapidjson/issues/1700
-CXXFLAGS="-Wno-type-limits -Wno-error=class-memaccess"
+CXXFLAGS="-Wno-type-limits -Wno-error=class-memaccess -DNDEBUG"
 
 post_patch() {
 	# Remove bin/jsonchecker, which is the JSON licensed files

From 5a033aea92f6ff50d32d40e7ea59d7f7adcb49e2 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, 27 Mar 2021 12:18:36 +0700
Subject: [PATCH 0331/2024] cura-engine: ignore -O3

---
 srcpkgs/cura-engine/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/cura-engine/patches/fix-cflags.patch

diff --git a/srcpkgs/cura-engine/patches/fix-cflags.patch b/srcpkgs/cura-engine/patches/fix-cflags.patch
new file mode 100644
index 000000000000..e48a665523b8
--- /dev/null
+++ b/srcpkgs/cura-engine/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -42,7 +42,7 @@ endif()
+ if(CMAKE_BUILD_TYPE_UPPER MATCHES "DEBUG")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG_INIT}")
+ else()
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
+ endif()
+ 
+ set(CMAKE_CXX_STANDARD 11)

From 2a7a880dccd52f3225e3b0f5f64f07e8e2925086 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, 27 Mar 2021 12:22:29 +0700
Subject: [PATCH 0332/2024] dislocker: remove -O1

---
 srcpkgs/dislocker/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/dislocker/patches/fix-cflags.patch

diff --git a/srcpkgs/dislocker/patches/fix-cflags.patch b/srcpkgs/dislocker/patches/fix-cflags.patch
new file mode 100644
index 000000000000..1229efeeaf0c
--- /dev/null
+++ b/srcpkgs/dislocker/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(NOT DEFINED WARN_FLAGS)
+ 	set (WARN_FLAGS "-Wall -Wextra" CACHE STRING "" FORCE)
+ endif()
+ if(NOT DEFINED HARDEN_FLAGS)
+-	set (HARDEN_FLAGS "-fstack-protector -fstrict-aliasing -D_FORTIFY_SOURCE=2 -O1" CACHE STRING "" FORCE)
++	set (HARDEN_FLAGS "-fstack-protector -fstrict-aliasing" CACHE STRING "" FORCE)
+ endif()
+ 
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")

From d1905ea33626eeddaecc0166447bd3cd4918d367 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, 27 Mar 2021 12:29:31 +0700
Subject: [PATCH 0333/2024] freeorion: remove -O3

---
 srcpkgs/freeorion/patches/fix-cflags.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/freeorion/patches/fix-cflags.patch

diff --git a/srcpkgs/freeorion/patches/fix-cflags.patch b/srcpkgs/freeorion/patches/fix-cflags.patch
new file mode 100644
index 000000000000..c66d54599556
--- /dev/null
+++ b/srcpkgs/freeorion/patches/fix-cflags.patch
@@ -0,0 +1,18 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -432,13 +432,6 @@ if(MSVC)
+     )
+ endif()
+ 
+-target_compile_options(freeorionparseobj
+-    PRIVATE
+-        $<$<CXX_COMPILER_ID:Clang>:-ftemplate-depth=512>
+-        $<$<CXX_COMPILER_ID:AppleClang>:-ftemplate-depth=512>
+-        $<$<AND:$<NOT:$<BOOL:${BUILD_TESTING}>>,$<CXX_COMPILER_ID:GNU>>:-O3>
+-)
+-
+ target_compile_definitions(freeorionparseobj
+     PUBLIC
+         -DBOOST_ALL_DYN_LINK

From 3bef51111acfe0d258537c840bca9f66d9b1b859 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, 26 Mar 2021 09:01:12 +0700
Subject: [PATCH 0334/2024] cglm: fix build flags

---
 srcpkgs/cglm/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/cglm/template                 |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/cglm/patches/fix-cflags.patch

diff --git a/srcpkgs/cglm/patches/fix-cflags.patch b/srcpkgs/cglm/patches/fix-cflags.patch
new file mode 100644
index 000000000000..c74de6ea62d7
--- /dev/null
+++ b/srcpkgs/cglm/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: cglm-0.7.6/CMakeLists.txt
+===================================================================
+--- cglm-0.7.6.orig/CMakeLists.txt
++++ cglm-0.7.6/CMakeLists.txt
+@@ -25,7 +25,7 @@ if(MSVC)
+ 	add_definitions(-DNDEBUG -D_WINDOWS -D_USRDLL -DCGLM_EXPORTS -DCGLM_DLL)
+ 	add_compile_options(/W3 /Ox /Gy /Oi /TC)
+ else()
+-  add_compile_options(-Wall -Werror -O3)
++  add_compile_options(-Wall)
+ endif()
+ 
+ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index f00a093edab9..311b4c79a7d3 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -9,6 +9,7 @@ license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
 checksum=29ff8af4edc03697e36d3e6f99a80b884a80ee09d46055ce45765e5d6b2456d9
+patch_args=-Np1
 
 post_install() {
 	vlicense LICENSE

From 431e4905a7b87aa26d4303f1114d88c53b117673 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, 27 Mar 2021 12:36:19 +0700
Subject: [PATCH 0335/2024] glyr: don't force Release build

---
 srcpkgs/glyr/patches/fix-cflags.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/glyr/patches/fix-cflags.patch

diff --git a/srcpkgs/glyr/patches/fix-cflags.patch b/srcpkgs/glyr/patches/fix-cflags.patch
new file mode 100644
index 000000000000..498ffe09a38f
--- /dev/null
+++ b/srcpkgs/glyr/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -60,7 +60,6 @@ exec_program(
+ IF(CMAKE_BUILD_TYPE STREQUAL "debug")
+     SET(GLYR_DEBUG TRUE)
+ ELSE()
+-    SET(CMAKE_BUILD_TYPE "release")
+     SET(GLYR_DEBUG FALSE)
+ ENDIF()
+ MESSAGE("-- Building Target: ${CMAKE_BUILD_TYPE}")

From 0d340c906cef17b3eee8b9e80211dcdb166a8f9b 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, 27 Mar 2021 12:41:50 +0700
Subject: [PATCH 0336/2024] hugin: remove -O3

---
 srcpkgs/hugin/patches/fix-cflags.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/hugin/patches/fix-cflags.patch

diff --git a/srcpkgs/hugin/patches/fix-cflags.patch b/srcpkgs/hugin/patches/fix-cflags.patch
new file mode 100644
index 000000000000..02fa56bef0e1
--- /dev/null
+++ b/srcpkgs/hugin/patches/fix-cflags.patch
@@ -0,0 +1,15 @@
+Index: src/celeste/CMakeLists.txt
+===================================================================
+--- src/celeste/CMakeLists.txt.orig
++++ src/celeste/CMakeLists.txt
+@@ -16,10 +16,6 @@
+ #    You should have received a copy of the GNU General Public License
+ #    along with Hugin  If not, see <http://www.gnu.org/licenses/>.
+  
+-IF(NOT WIN32)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+-ENDIF(NOT WIN32)
+-
+ # a list of all files belonging to celeste library
+ 
+ SET(CELESTE_SRC

From 63dbe0493f678d2eb13a5584dd75a093f095f8b1 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, 27 Mar 2021 13:05:27 +0700
Subject: [PATCH 0337/2024] ledger: don't overwrite CMAKE_BUILD_TYPE

---
 srcpkgs/ledger/patches/fix-cflags.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/ledger/patches/fix-cflags.patch

diff --git a/srcpkgs/ledger/patches/fix-cflags.patch b/srcpkgs/ledger/patches/fix-cflags.patch
new file mode 100644
index 000000000000..179ab79cd148
--- /dev/null
+++ b/srcpkgs/ledger/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -41,7 +41,6 @@ if (BUILD_DEBUG)
+   set(CMAKE_BUILD_TYPE Debug)
+   set(DEBUG_MODE 1)
+ else()
+-  set(CMAKE_BUILD_TYPE Release)
+   set(DEBUG_MODE 0)
+ endif()
+ 

From a34df08e8767ff98f26a29e38660c93f05f8a41b 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, 27 Mar 2021 13:18:24 +0700
Subject: [PATCH 0338/2024] libmygpo-qt: remove -ggdb3

---
 srcpkgs/libmygpo-qt/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/libmygpo-qt/patches/fix-cflags.patch

diff --git a/srcpkgs/libmygpo-qt/patches/fix-cflags.patch b/srcpkgs/libmygpo-qt/patches/fix-cflags.patch
new file mode 100644
index 000000000000..9940b6fc4323
--- /dev/null
+++ b/srcpkgs/libmygpo-qt/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -69,7 +69,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+        -Wwrite-strings -Wpacked -Wformat-security -Wmissing-format-attribute
+        -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor  -Wall -Wextra
+        -Wformat=2 -Wundef -Wstack-protector -Wmissing-include-dirs
+-       -Winit-self -Wunsafe-loop-optimizations  -ggdb3 -fno-inline -DQT_STRICT_ITERATORS )
++       -Winit-self -Wunsafe-loop-optimizations  -fno-inline -DQT_STRICT_ITERATORS )
+     if ( NOT WIN32 )
+         add_definitions( -fvisibility=hidden )
+     endif()

From fe54ddb329cfc2cb685f0685ff6e282705a644f9 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, 27 Mar 2021 13:48:38 +0700
Subject: [PATCH 0339/2024] libogre: don't build vendored libraries

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

diff --git a/srcpkgs/libogre/template b/srcpkgs/libogre/template
index 784e3a648bac..df60f7b4f542 100644
--- a/srcpkgs/libogre/template
+++ b/srcpkgs/libogre/template
@@ -1,25 +1,22 @@
-# Template file for 'ogre'
+# Template file for 'libogre'
 pkgname=libogre
 version=1.12.9
 revision=1
+wrksrc=ogre-$version
 build_style=cmake
-configure_args="-DCMAKE_INSTALL_PREFIX=/usr \
-	-DOGRE_INSTALL_SAMPLES=TRUE \
-	-DOGRE_INSTALL_DOCS=TRUE \
-	-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
-	-DCMAKE_BUILD_TYPE=Release"
+configure_args="-DOGRE_INSTALL_SAMPLES=TRUE -DOGRE_INSTALL_DOCS=TRUE
+ -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE -DOGRE_BUILD_DEPENDENCIES=FALSE"
+make_build_target="all OgreDoc"
 hostmakedepends="pkg-config graphviz doxygen dejavu-fonts-ttf"
 makedepends="boost-devel freetype-devel libXaw-devel libXrandr-devel
  MesaLib-devel zziplib-devel libcppunit-devel glu-devel libatomic-devel
  freeimage-devel pugixml-devel python3-devel"
 short_desc="Scene-oriented, flexible 3D engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-homepage="http://www.ogre3d.org"
 license="MIT"
+homepage="http://www.ogre3d.org"
 distfiles="https://github.com/OGRECave/ogre/archive/v$version.tar.gz"
 checksum=028e7d0bbfce8fd254e1102666b07b7cbb9379321e88885d82feee5e061342aa
-make_build_target="all OgreDoc"
-wrksrc=ogre-$version
 
 pre_configure() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From d7ec8839401b2facb569416438c679c60056c7de 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, 27 Mar 2021 13:52:50 +0700
Subject: [PATCH 0340/2024] libopenglrecorder: remove -O3

---
 srcpkgs/libopenglrecorder/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/libopenglrecorder/patches/fix-cflags.patch

diff --git a/srcpkgs/libopenglrecorder/patches/fix-cflags.patch b/srcpkgs/libopenglrecorder/patches/fix-cflags.patch
new file mode 100644
index 000000000000..7c48a0d2d822
--- /dev/null
+++ b/srcpkgs/libopenglrecorder/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -21,7 +21,7 @@ if (UNIX OR MINGW)
+     if (CMAKE_BUILD_TYPE MATCHES Debug)
+         add_definitions(-std=gnu++0x -O0)
+     else()
+-        add_definitions(-std=gnu++0x -O3)
++        add_definitions(-std=gnu++0x)
+     endif()
+ endif()
+ 

From 0bb595f1c47bc08685c500f0a8aa75c7052de26e 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, 27 Mar 2021 13:55:41 +0700
Subject: [PATCH 0341/2024] libvidstab: remove -O3

---
 srcpkgs/libvidstab/patches/fix-cflags.patch | 39 +++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/libvidstab/patches/fix-cflags.patch

diff --git a/srcpkgs/libvidstab/patches/fix-cflags.patch b/srcpkgs/libvidstab/patches/fix-cflags.patch
new file mode 100644
index 000000000000..51c357efb101
--- /dev/null
+++ b/srcpkgs/libvidstab/patches/fix-cflags.patch
@@ -0,0 +1,39 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -25,7 +25,7 @@ else()
+     set(LIBSUFFIX "")
+ endif()
+ 
+-add_definitions( -Wall -O3 -g -Wno-pointer-sign -fPIC -std=gnu99)
++add_definitions( -Wall -Wno-pointer-sign -fPIC -std=gnu99)
+ # add_definitions(  -Wall -O0 -g -Wno-pointer-sign )
+ 
+ ### ORC is not used in any active code at the moment  ###
+Index: tests/CMakeLists.txt
+===================================================================
+--- tests/CMakeLists.txt.orig
++++ tests/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
+ option(USE_OMP "use parallelization use OMP" ON)
+ 
+ #add_definitions( -Wall -O3 -Wno-pointer-sign -DTESTING  -std=gnu99)
+-add_definitions(  -Wall -O0 -g -Wno-pointer-sign -DTESTING -std=gnu99)
++add_definitions(  -Wall -Wno-pointer-sign -DTESTING -std=gnu99)
+ find_package(Orc)
+ if(ORC_FOUND)
+ add_definitions( -DUSE_ORC ${ORC_DEFINITIONS})
+Index: transcode/CMakeLists.txt
+===================================================================
+--- transcode/CMakeLists.txt.orig
++++ transcode/CMakeLists.txt
+@@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
+ set(TRANSCODE_ROOT ../../transcode)
+ 
+ 
+-add_definitions( -Wall -O3 -Wno-pointer-sign -DTRANSCODE -std=gnu99)
++add_definitions( -Wall -Wno-pointer-sign -DTRANSCODE -std=gnu99)
+ #add_definitions(  -Wall -O0 -g -Wno-pointer-sign )
+ # I tried it with 0.4.14
+ #  0.4.10 did not work (not all opcode implemented)

From e121f3bb45d21629e7c737092a6038a1098b94d6 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, 27 Mar 2021 14:18:34 +0700
Subject: [PATCH 0342/2024] openlierox: don't overwrote CMAKE_BUILD_TYPE

---
 srcpkgs/openlierox/patches/fix-cflags.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/openlierox/patches/fix-cflags.patch

diff --git a/srcpkgs/openlierox/patches/fix-cflags.patch b/srcpkgs/openlierox/patches/fix-cflags.patch
new file mode 100644
index 000000000000..4fe6652fd0a2
--- /dev/null
+++ b/srcpkgs/openlierox/patches/fix-cflags.patch
@@ -0,0 +1,17 @@
+Index: CMakeOlxCommon.cmake
+===================================================================
+--- CMakeOlxCommon.cmake.orig
++++ CMakeOlxCommon.cmake
+@@ -36,12 +36,6 @@ OPTION(BREAKPAD "Google Breakpad support
+ OPTION(DISABLE_JOYSTICK "Disable joystick support" No)
+ OPTION(MINGW_CROSS_COMPILE "Cross-compile Windows .EXE using i686-w64-mingw32-gcc compiler" No)
+ 
+-IF (DEBUG)
+-	SET(CMAKE_BUILD_TYPE Debug)
+-ELSE (DEBUG)
+-	SET(CMAKE_BUILD_TYPE Release)
+-ENDIF (DEBUG)
+-
+ IF (DEDICATED_ONLY)
+ 	SET(X11 No)
+ 	SET(WITH_G15 No)

From 9875f783d9c4c3b4eaeb0357f1c675cccd9439d5 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, 27 Mar 2021 14:25:12 +0700
Subject: [PATCH 0343/2024] opensonic: don't overwrite CMAKE_BUILD_TYPE

---
 srcpkgs/opensonic/patches/fix-cflags.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/opensonic/patches/fix-cflags.patch

diff --git a/srcpkgs/opensonic/patches/fix-cflags.patch b/srcpkgs/opensonic/patches/fix-cflags.patch
new file mode 100644
index 000000000000..10d2c7c80e64
--- /dev/null
+++ b/srcpkgs/opensonic/patches/fix-cflags.patch
@@ -0,0 +1,17 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -25,12 +25,10 @@ SET(GAME_NAME "Open Sonic")
+ SET(GAME_VERSION "0.1.4")
+ SET(RTFM "Please read the user manual (readme.html) to get help.")
+ SET(ALLEGRO_RECOMMENDED_VERSION "4.4.1")
+-SET(CMAKE_BUILD_TYPE Release)
+ MESSAGE("${GAME_NAME} version ${GAME_VERSION}")
+ 
+ # configuring...
+ SET(DEFS "")
+-SET(CFLAGS_EXTRA "-g")
+ SET(CFLAGS "${CFLAGS} ${CMAKE_C_FLAGS}")
+ MESSAGE("Using CFLAGS='${CFLAGS}'")
+ 

From 20b8f5836abe57cf9fea0ea4a993e8449f47c2ed 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, 27 Mar 2021 15:17:28 +0700
Subject: [PATCH 0344/2024] rocksdb: don't overwrite CMAKE_BUILD_TYPE

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

diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template
index e39329e5d6a6..2ae7db40ab91 100644
--- a/srcpkgs/rocksdb/template
+++ b/srcpkgs/rocksdb/template
@@ -3,15 +3,16 @@ pkgname=rocksdb
 version=5.18.3
 revision=2
 build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DWITH_TESTS=0
- -DUSE_RTTI=0 -DWITH_LZ4=1"
+configure_args="-DPORTABLE=1 -DWITH_TESTS=0 -DUSE_RTTI=0 -DWITH_LZ4=1"
 makedepends="liblz4-devel"
 short_desc="RocksDB is a embeddable, persistent key-value store for fast storage"
 maintainer="magenbluten <mb0@codemonkey.cc>"
-license="GPL-2.0-or-later, Apache-2.0"
+license="GPL-2.0-or-later, Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/facebook/rocksdb"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=7fb6738263d3f2b360d7468cf2ebe333f3109f3ba1ff80115abd145d75287254
+CFLAGS=-DNDEBUG
+CXXFLAGS=-DNDEBUG
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d9838acf5c01ec396e0727dfd2d38c08afd3ea07 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, 27 Mar 2021 15:40:26 +0700
Subject: [PATCH 0345/2024] seexpr-krita: don't overwrite CMAKE_BUILD_TYPE

---
 .../patches/cmake-build-type-none.patch       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch b/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..94bb1f37db75
--- /dev/null
+++ b/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch
@@ -0,0 +1,32 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -42,14 +42,6 @@ endif()
+ 
+ ## Choose build options
+ # Disney specific method of choosing variant
+-if (${FLAVOR} STREQUAL "optimize")
+-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE)
+-endif()
+-
+-if (${FLAVOR} STREQUAL "debug")
+-    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "type of build" FORCE)
+-endif()
+-
+ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+     execute_process(
+         COMMAND sh -c "echo `uname -s`-`uname -r | cut -d- -f1`-`uname -m`"
+@@ -212,12 +204,6 @@ else()
+ endif()
+ 
+ # Set to release if nothing else defined
+-if (NOT CMAKE_BUILD_TYPE)
+-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING
+-      "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
+-      FORCE)
+-endif()
+-
+ if (ENABLE_QT5)
+     find_package(Qt5 5.9.0 COMPONENTS Core Gui Widgets REQUIRED)
+     set_package_properties(Qt5 PROPERTIES

From 552611a2324fdebd2ec11dbcadae3bebe496e84d 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, 27 Mar 2021 15:50:53 +0700
Subject: [PATCH 0346/2024] speed-dreams: hardening

---
 srcpkgs/speed-dreams/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 722f0c5ed87a..df7164f9c808 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -1,13 +1,13 @@
 # Template file for 'speed-dreams'
 pkgname=speed-dreams
 version=2.2.2
-revision=2
+revision=3
 archs="i686* x86_64* ppc64le*"
 _rev=r6553
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2 -DSD_LIBDIR=/usr/lib/speed-dreams-2
- -DOPTION_OFFICIAL_ONLY=ON -DCMAKE_CXX_FLAGS=-fpermissive -DCMAKE_C_FLAGS=-fpermissive"
+configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2
+ -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON"
 hostmakedepends="pkg-config"
 makedepends="freealut-devel libenet-devel libfreeglut-devel libjpeg-turbo-devel
  libpng-devel libvorbis-devel libXrandr-devel osg-devel plib-devel SDL2-devel
@@ -26,6 +26,8 @@ checksum="32aa55c17f8dafc1c54fb0d0b7b993d2688d431899cfc5db9eeece148c6887d0
  0b7b417d007ab3b7f0f4dcfdc868aafee1722150b81af519e1cd4c082b408183"
 nocross=yes
 replaces="speed-dreams-data>=0"
+CFLAGS=-fpermissive
+CXXFLAGS=-fpermissive
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	broken="Segmentation fault"

From 9253cad321eaca47bedfe25f5eb94ed89961edf6 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, 27 Mar 2021 19:04:09 +0700
Subject: [PATCH 0347/2024] traverso: hardening

---
 .../patches/cmake-build-type-none.patch       | 28 +++++++++++++++++++
 srcpkgs/traverso/template                     |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/traverso/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/traverso/patches/cmake-build-type-none.patch b/srcpkgs/traverso/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..75b3fd941eb8
--- /dev/null
+++ b/srcpkgs/traverso/patches/cmake-build-type-none.patch
@@ -0,0 +1,28 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -65,13 +65,7 @@ SET(TRAVERSO_DEFINES -DSTATIC_BUILD)
+ 
+ #BUILD SETUP
+ #None, Debug, Release, .. or custom ones
+-IF(WANT_DEBUG)
+-  SET(CMAKE_BUILD_TYPE DEBUG)
+-  SET(WANT_TRAVERSO_DEBUG ON)
+-ELSE(WANT_DEBUG)
+-  SET(CMAKE_BUILD_TYPE RELEASE)
+-  LIST(APPEND TRAVERSO_DEFINES -DQT_NO_DEBUG)
+-ENDIF(WANT_DEBUG)
++LIST(APPEND TRAVERSO_DEFINES -DQT_NO_DEBUG)
+ 
+ 
+ IF(WANT_TRAVERSO_DEBUG)
+@@ -326,7 +320,7 @@ ${Qt5Xml_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDES}
+ )
+ 
+-set(CMAKE_CXX_FLAGS "-fPIC")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ 
+ #Set up libraries to link with all found packages
+ LINK_LIBRARIES (
diff --git a/srcpkgs/traverso/template b/srcpkgs/traverso/template
index 105924d4f0c6..4b93460f63d7 100644
--- a/srcpkgs/traverso/template
+++ b/srcpkgs/traverso/template
@@ -1,7 +1,7 @@
 # Template file for 'traverso'
 pkgname=traverso
 version=0.49.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWANT_MP3_ENCODE=ON -DDETECT_HOST_CPU_FEATURES=OFF"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 3ba0aedfcf8a5e82b2b0585df4c94a245345a667 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, 27 Mar 2021 19:08:11 +0700
Subject: [PATCH 0348/2024] xstarter: hardening

---
 .../patches/cmake-build-type-none.patch       | 22 +++++++++++++++++++
 srcpkgs/xstarter/template                     |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xstarter/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/xstarter/patches/cmake-build-type-none.patch b/srcpkgs/xstarter/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..4f793e4c473c
--- /dev/null
+++ b/srcpkgs/xstarter/patches/cmake-build-type-none.patch
@@ -0,0 +1,22 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -5,16 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+ 
+ project(xstarter)
+ 
+-if(NOT CMAKE_BUILD_TYPE)
+-  set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)" FORCE)
+-endif()
+-
+ set(PROJECT_VERSION "0.8.0")
+-if (CMAKE_BUILD_TYPE STREQUAL Debug)
+-  set(CMAKE_C_FLAGS "-g -Wall -pedantic")
+-else()
+-  set(CMAKE_C_FLAGS "-Wall -pedantic -O3")
+-endif()
++set(CMAKE_C_FLAGS "-Wall -pedantic ${CMAKE_C_FLAGS}")
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
+ 
+ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
diff --git a/srcpkgs/xstarter/template b/srcpkgs/xstarter/template
index aa9a47e45e5c..4363d36e3c39 100644
--- a/srcpkgs/xstarter/template
+++ b/srcpkgs/xstarter/template
@@ -1,7 +1,7 @@
 # Template file for 'xstarter'
 pkgname=xstarter
 version=0.8.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glib-devel ncurses-devel"

From f47bf5ab215f75e389468d23837e55791c964061 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, 27 Mar 2021 19:15:48 +0700
Subject: [PATCH 0349/2024] yabause-gtk: ignore -O3

---
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch

diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
new file mode 100644
index 000000000000..52c1cae61799
--- /dev/null
+++ b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -659,7 +659,7 @@ else ()
+ 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
+ endif ()
+ 
+-set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
++set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
+ 
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")

From 1e44a82f2a71275f70a16675cd26db09abf7aea2 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, 27 Mar 2021 19:26:47 +0700
Subject: [PATCH 0350/2024] ympd: hardening

---
 srcpkgs/ympd/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/ympd/template                 |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ympd/patches/fix-cflags.patch

diff --git a/srcpkgs/ympd/patches/fix-cflags.patch b/srcpkgs/ympd/patches/fix-cflags.patch
new file mode 100644
index 000000000000..4720dd39e748
--- /dev/null
+++ b/srcpkgs/ympd/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -24,7 +24,7 @@ include_directories(${PROJECT_BINARY_DIR
+ 
+ include(CheckCSourceCompiles)
+ 
+-set(CMAKE_C_FLAGS "-std=gnu99 -Wall")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall")
+ set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic")
+ if(WITH_IPV6)
+     set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS NS_ENABLE_IPV6)
diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index 14437beb5384..450c079b2ca3 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,7 +1,7 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="perl pkg-config"
 makedepends="libmpdclient-devel openssl-devel"

From b261bb6a46a22506f79e10639f30454411487b88 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, 27 Mar 2021 19:29:31 +0700
Subject: [PATCH 0351/2024] z80ex: hardening

---
 srcpkgs/z80ex/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/z80ex/template                 |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/z80ex/patches/fix-cflags.patch

diff --git a/srcpkgs/z80ex/patches/fix-cflags.patch b/srcpkgs/z80ex/patches/fix-cflags.patch
new file mode 100644
index 000000000000..6743da255e5c
--- /dev/null
+++ b/srcpkgs/z80ex/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -11,7 +11,7 @@ option (OPSTEP_FAST_AND_ROUGH "Fast and
+ 
+ #ALL_CFLAGS := -fPIC -fno-common -ansi -pedantic -Wall -pipe -O2 -I. -I./include
+ if (CMAKE_COMPILER_IS_GNUCC)
+-    set (CMAKE_C_FLAGS "-fPIC -fno-common -ansi -pedantic -Wall -pipe -O2")
++    set (CMAKE_C_FLAGS "-fPIC -fno-common -ansi -pedantic -Wall -pipe ${CMAKE_C_FLAGS}")
+ endif ()
+ 
+ include_directories(BEFORE . include)
diff --git a/srcpkgs/z80ex/template b/srcpkgs/z80ex/template
index 00a24a6fb902..5437f53d33d5 100644
--- a/srcpkgs/z80ex/template
+++ b/srcpkgs/z80ex/template
@@ -1,11 +1,11 @@
 # Template file for 'z80ex'
 pkgname=z80ex
 version=1.1.21
-revision=1
+revision=2
 build_style=cmake
 short_desc="ZiLOG Z80 CPU emulation library"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://sourceforge.net/projects/z80ex/"
 distfiles="${SOURCEFORGE_SITE}/project/z80ex/z80ex/${version}/z80ex-${version}.tar.gz"
 checksum=6f5e521d068a614b41e10180ad4ae45b1bc258ec28c962543feb9078856c2530

From 2f3aaf65df667f6468aaa9790af62c10725eecac 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, 27 Mar 2021 19:17:13 +0700
Subject: [PATCH 0352/2024] scribus: don't overwrite cmake-build-type

---
 .../patches/cmake-build-type-none.patch       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/scribus/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..670c83cc48f5
--- /dev/null
+++ b/srcpkgs/scribus/patches/cmake-build-type-none.patch
@@ -0,0 +1,33 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -35,11 +35,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ 
+ 
+ #RPATH setup - more below too
+-if (WANT_NORPATH OR WANT_DISTROBUILD)
+-	set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-else()
+-	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+-endif()
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+ set(CMAKE_SKIP_BUILD_RPATH TRUE)
+@@ -309,16 +304,6 @@ include (CMakeLists_Directories.cmake)
+ #Convert our simpler command line option to the CMake style
+ #None, Debug, Release, .. or custom ones
+ # set(WANT_DEBUG ON)
+-if(WANT_DEBUG)
+-	set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE)
+-endif()
+-if (WANT_RELEASEWITHDEBUG)
+-	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Set Release with Debug Info Build Type" FORCE)
+-endif()
+-if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
+-	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
+-endif()
+-
+ 
+ 
+ #Based on our build type, setup our build options

From 5b4ce4977285ea49ce1913077856983bf8852ffc 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, 28 Mar 2021 10:39:04 +0700
Subject: [PATCH 0353/2024] yoshimi: cleanup, don't overwrite CMAKE_BUILD_TYPE

---
 srcpkgs/yoshimi/patches/fix-cflags.patch | 12 ++++++++++++
 srcpkgs/yoshimi/template                 | 13 +------------
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/yoshimi/patches/fix-cflags.patch

diff --git a/srcpkgs/yoshimi/patches/fix-cflags.patch b/srcpkgs/yoshimi/patches/fix-cflags.patch
new file mode 100644
index 000000000000..4baeb82ef4e3
--- /dev/null
+++ b/srcpkgs/yoshimi/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -262,7 +262,6 @@ if (BuildForDebug)
+     set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
+     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+ else()
+-    set (CMAKE_BUILD_TYPE "Release")
+     set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
+     message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
+ endif ()
diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 0096f7f05710..64a6c9ad433f 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -4,6 +4,7 @@ version=1.7.4
 revision=2
 build_wrksrc=src
 build_style=cmake
+configure_args="-DCMAKE_INSTALL_DATAROOTDIR=/usr/share"
 hostmakedepends="pkg-config fltk"
 makedepends="boost-devel jack-devel fltk-devel fftw-devel mxml-devel cairo-devel
  lv2 readline-devel ncurses-devel"
@@ -17,15 +18,3 @@ checksum=27a8e33bda72aafae604e14841bed6373fc9e00ff70c98f1e13215d6a8808318
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;
 esac
-
-configure_args="-DCMAKE_INSTALL_DATAROOTDIR=/usr/share"
-
-pre_configure() {
-	sed -i 's|ncurses|ncursesw|g' CMakeLists.txt
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) ;;
-		x86_64*) ;;
-		*) sed -i -e "s|-msse -msse2 -mfpmath=sse||g" CMakeLists.txt;;
-	esac
-}

From 19f5bf27ddb17f6c8308c0844f41991dc90e0843 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, 28 Mar 2021 10:49:25 +0700
Subject: [PATCH 0354/2024] zulucrypt: remove -O3

---
 srcpkgs/zulucrypt/patches/fix-cflags.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/zulucrypt/patches/fix-cflags.patch

diff --git a/srcpkgs/zulucrypt/patches/fix-cflags.patch b/srcpkgs/zulucrypt/patches/fix-cflags.patch
new file mode 100644
index 000000000000..d77c539c6c13
--- /dev/null
+++ b/srcpkgs/zulucrypt/patches/fix-cflags.patch
@@ -0,0 +1,26 @@
+Index: external_libraries/tcplay/CMakeLists.txt
+===================================================================
+--- external_libraries/tcplay/CMakeLists.txt.orig
++++ external_libraries/tcplay/CMakeLists.txt
+@@ -13,7 +13,7 @@ set (SRCS_LINUX  crypto-gcrypt.c)
+ set (CFLAGS_LINUX  "-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE")
+ set (CFLAGS_WARN "-w")
+ set (CFLAGS_DEBUG  "-O0 -g3 -DDEBUG")
+-set (CFLAGS_OPT    "-O3")
++set (CFLAGS_OPT    "")
+ set (CFLAGS_VER    "-DMAJ_VER=${VERSION_MAJOR} -DMIN_VER=${VERSION_MINOR}")
+ set (CFLAGS_COMMON "-std=c99 -fPIC  ${CFLAGS_LINUX} ${CFLAGS_WARN} ${CFLAGS_VER}")
+ if ($ENV{DEBUG})
+Index: external_libraries/tcplay/Makefile.classic
+===================================================================
+--- external_libraries/tcplay/Makefile.classic.orig
++++ external_libraries/tcplay/Makefile.classic
+@@ -47,8 +47,6 @@ COMMON_CFLAGS= $(WARNFLAGS) -fPIC $(VER_
+ 
+ ifeq ($(DEBUG), yes)
+   COMMON_CFLAGS+= -O0 -g -DDEBUG
+-else
+-  COMMON_CFLAGS+= -O3
+ endif
+ 
+ ifeq (${SYSTEM}, linux)

From e48131b11fab9bc0d5bac189438d4c2f877f33e1 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, 28 Mar 2021 10:43:24 +0700
Subject: [PATCH 0355/2024] zbackup: don't overwrite CMAKE_BUILD_TYPE

---
 .../patches/cmake-build-type-none.patch       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/zbackup/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/zbackup/patches/cmake-build-type-none.patch b/srcpkgs/zbackup/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..6d6ebc8e124d
--- /dev/null
+++ b/srcpkgs/zbackup/patches/cmake-build-type-none.patch
@@ -0,0 +1,26 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -6,8 +6,6 @@ project( zbackup )
+ 
+ set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
+ 
+-set( CMAKE_BUILD_TYPE Release )
+-
+ find_package( ZLIB REQUIRED )
+ include_directories( ${ZLIB_INCLUDE_DIRS} )
+ 
+Index: tartool/CMakeLists.txt
+===================================================================
+--- tartool/CMakeLists.txt.orig
++++ tartool/CMakeLists.txt
+@@ -4,8 +4,6 @@
+ cmake_minimum_required( VERSION 2.6.0 )
+ project( tartool )
+ 
+-set( CMAKE_BUILD_TYPE Release )
+-
+ add_executable( tartool tartool.cc ../file.cc ../dir.cc )
+ 
+ install( TARGETS tartool DESTINATION bin )

From 088221d82b6e49e9045e4b4a5b0e09e3698f048e 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, 27 Mar 2021 15:19:47 +0700
Subject: [PATCH 0356/2024] rofs-filtered: hardening

---
 srcpkgs/rofs-filtered/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/rofs-filtered/template                 | 10 +++-------
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/rofs-filtered/patches/fix-cflags.patch

diff --git a/srcpkgs/rofs-filtered/patches/fix-cflags.patch b/srcpkgs/rofs-filtered/patches/fix-cflags.patch
new file mode 100644
index 000000000000..b77600f66784
--- /dev/null
+++ b/srcpkgs/rofs-filtered/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -9,7 +9,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PA
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
+ add_definitions(-D_GNU_SOURCE)
+-set(CMAKE_C_FLAGS "-Wall -std=c99")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Wall -std=c99")
+ 
+ # find fuse library
+ find_package (FUSE REQUIRED)
diff --git a/srcpkgs/rofs-filtered/template b/srcpkgs/rofs-filtered/template
index 332cd57a9902..2bb8a2304312 100644
--- a/srcpkgs/rofs-filtered/template
+++ b/srcpkgs/rofs-filtered/template
@@ -1,17 +1,13 @@
 # Template file for 'rofs-filtered'
 pkgname=rofs-filtered
 version=1.7
-revision=1
+revision=2
+wrksrc="${pkgname}-rel-${version}"
 build_style=cmake
 makedepends="fuse-devel"
 short_desc="Filtered read only filesystem for FUSE"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/gburca/rofs-filtered"
 distfiles="https://github.com/gburca/rofs-filtered/archive/rel-${version}.tar.gz"
 checksum=d66066dfd0274a2fb7b71dd929445377dd23100b9fa43e3888dbe3fc7e8228e8
-wrksrc="${pkgname}-rel-${version}"
-
-pre_configure() {
-	sed -i -e 's/CMAKE_C_FLAGS "/CMAKE_C_FLAGS "-fPIC /' ${wrksrc}/CMakeLists.txt
-}

From 75295528a1fd128e78272c6076f11ebb1d223e84 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 3 Feb 2021 20:30:36 +0100
Subject: [PATCH 0357/2024] audit: update to 3.0.1

Closes: #28447 [via git-merge-pr]
---
 ...uparse-caused-by-corrected-event-ord.patch | 31 ------
 ...uparse-caused-by-corrected-event-ord.patch | 41 --------
 srcpkgs/audit/patches/musl.patch              | 97 -------------------
 srcpkgs/audit/patches/seed-random.patch       | 13 +++
 srcpkgs/audit/template                        | 10 +-
 5 files changed, 18 insertions(+), 174 deletions(-)
 delete mode 100644 srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
 delete mode 100644 srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
 delete mode 100644 srcpkgs/audit/patches/musl.patch
 create mode 100644 srcpkgs/audit/patches/seed-random.patch

diff --git a/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch b/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
deleted file mode 100644
index 0c2b320bb0a4..000000000000
--- a/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c2544c220bb1b1045589ceae3dbb69f195b860e5 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Mar 2019 09:18:00 -0400
-Subject: [PATCH 1/2] Fix memleak in auparse caused by corrected event ordering
-
----
- auparse/auparse.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git auparse/auparse.c auparse/auparse.c
-index 34aa90c..ecea88e 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -265,6 +265,14 @@ static event_list_t *au_get_ready_event(auparse_state_t *au, int is_test)
- 			au_lolnode *ptr = lowest;
- 			while (ptr->status == EBS_EMPTY && lol->maxi > 0) {
- 				lol->maxi--;
-+				if (ptr->l) {
-+					aup_list_clear(ptr->l);
-+					free(ptr->l);
-+					ptr->l = NULL;
-+					au->le = NULL;	// this should crash
-+							// usage of au->le
-+							// until reset
-+				}
- 				ptr = &lol->array[lol->maxi];
- 			}
- 		}
--- 
-2.24.0
-
diff --git a/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch b/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
deleted file mode 100644
index ed6a89911314..000000000000
--- a/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce0debf94f93d787d3bed635952133b2a5ff3551 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Mar 2019 17:24:37 -0400
-Subject: [PATCH 2/2] Fix memleak in auparse caused by corrected event ordering
- part 2
-
----
- auparse/auparse.c | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git auparse/auparse.c auparse/auparse.c
-index ecea88e..5318d25 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -259,23 +259,6 @@ static event_list_t *au_get_ready_event(auparse_state_t *au, int is_test)
- 	if (lowest && lowest->status == EBS_COMPLETE) {
- 		lowest->status = EBS_EMPTY;
- 		au->au_ready--;
--		// Try to consolidate the array so that we iterate
--		// over a smaller portion next time
--		if (lowest == &lol->array[lol->maxi]) {
--			au_lolnode *ptr = lowest;
--			while (ptr->status == EBS_EMPTY && lol->maxi > 0) {
--				lol->maxi--;
--				if (ptr->l) {
--					aup_list_clear(ptr->l);
--					free(ptr->l);
--					ptr->l = NULL;
--					au->le = NULL;	// this should crash
--							// usage of au->le
--							// until reset
--				}
--				ptr = &lol->array[lol->maxi];
--			}
--		}
- 		return lowest->l;
- 	}
- 
--- 
-2.24.0
-
diff --git a/srcpkgs/audit/patches/musl.patch b/srcpkgs/audit/patches/musl.patch
deleted file mode 100644
index ba5942a99f04..000000000000
--- a/srcpkgs/audit/patches/musl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From d579a08bb1cde71f939c13ac6b2261052ae9f77e Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Feb 2019 18:33:33 -0500
-Subject: [PATCH] Add substitue functions for strndupa & rawmemchr
-
-diff --git auparse/auparse.c auparse/auparse.c
-index 69127b7a..042ea2b0 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -1119,6 +1119,16 @@ static int str2event(char *s, au_event_t *e)
- 	return 0;
- }
- 
-+#ifndef HAVE_STRNDUPA
-+static inline char *strndupa(const char *old, size_t n)
-+{
-+	size_t len = strnlen(old, n);
-+	char *tmp = alloca(len + 1);
-+	tmp[len] = 0;
-+	return memcpy(tmp, old, len);
-+}
-+#endif
-+
- /* Returns 0 on success and 1 on error */
- static int extract_timestamp(const char *b, au_event_t *e)
- {
-diff --git auparse/interpret.c auparse/interpret.c
-index 88523c6d..f19ee854 100644
---- auparse/interpret.c
-+++ auparse/interpret.c
-@@ -855,6 +855,13 @@ static const char *print_escaped_ext(const idata *id)
- 		return print_escaped(id->val);
- }
- 
-+// rawmemchr is faster. Let's use it if we have it.
-+#ifdef HAVE_RAWMEMCHR
-+#define STRCHR rawmemchr
-+#else
-+#define STRCHR strchr
-+#endif
-+
- static const char *print_proctitle(const char *val)
- {
- 	char *out = (char *)print_escaped(val);
-@@ -865,7 +872,7 @@ static const char *print_proctitle(const char *val)
- 		// Proctitle has arguments separated by NUL bytes
- 		// We need to write over the NUL bytes with a space
- 		// so that we can see the arguments
--		while ((ptr  = rawmemchr(ptr, '\0'))) {
-+		while ((ptr  = STRCHR(ptr, '\0'))) {
- 			if (ptr >= end)
- 				break;
- 			*ptr = ' ';
-diff --git configure.ac configure.ac
-index acd6d615..00658d4f 100644
---- configure.ac
-+++ configure.ac
-@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote
- AC_CHECK_FUNCS([posix_fallocate])
- dnl; signalfd is needed for libev
- AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ])
-+dnl; check if rawmemchr is available
-+AC_CHECK_FUNCS([rawmemchr])
-+dnl; check if strndupa is available
-+AC_LINK_IFELSE(
-+  [AC_LANG_SOURCE(
-+    [[
-+      #define _GNU_SOURCE
-+      #include <string.h>
-+      int main() { (void) strndupa("test", 10); return 0; }]])],
-+ [AC_DEFINE(HAVE_STRNDUPA, 1, [Let us know if we have it or not])],
-+ []
-+)
- 
- ALLWARNS=""
- ALLDEBUG="-g"
-diff --git src/ausearch-lol.c src/ausearch-lol.c
-index bebbcf4b..0babd517 100644
---- src/ausearch-lol.c
-+++ src/ausearch-lol.c
-@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2)
- 	return 0;
- }
- 
-+#ifndef HAVE_STRNDUPA
-+static inline char *strndupa(const char *old, size_t n)
-+{
-+	size_t len = strnlen(old, n);
-+	char *tmp = alloca(len + 1);
-+	tmp[len] = 0;
-+	return memcpy(tmp, old, len);
-+}
-+#endif
-+
- /*
-  * This function will look at the line and pick out pieces of it.
-  */
diff --git a/srcpkgs/audit/patches/seed-random.patch b/srcpkgs/audit/patches/seed-random.patch
new file mode 100644
index 000000000000..4bdfc90e72f2
--- /dev/null
+++ b/srcpkgs/audit/patches/seed-random.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/test/lookup_test.c b/lib/test/lookup_test.c
+index 03f40aa..7d17a90 100644
+--- a/lib/test/lookup_test.c
++++ b/lib/test/lookup_test.c
+@@ -48,6 +48,7 @@ gen_id(char *dest)
+ {
+ 	size_t i, len;
+ 
++	srand(300);
+ 	assert(S_LEN >= 2);
+ 	len = 1 + rand() % (S_LEN - 1);
+ 	assert('A' == 0x41 && 'a' == 0x61); /* ASCII */
+
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 3294ac19927e..fcd5de93732d 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
 # Template file for 'audit'
 pkgname=audit
-version=2.8.5
-revision=5
+version=3.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
  --with-apparmor --with-libcap-ng --with-python3"
@@ -13,10 +13,10 @@ short_desc="Linux Security Auditing Framework"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://people.redhat.com/sgrubb/audit"
+changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=0e5d4103646e00f8d1981e1cd2faea7a2ae28e854c31a803e907a383c5e2ecb7
-
-CFLAGS="-fcommon"
+checksum=994c4250d8fd43f3087a3c2ce73461832e30f1e9b278bf5bb03c3e07091155a5
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" --disable-zos-remote" ;;

From e4f3db13ed369e148af1de44f504d7e8e68d3c08 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 3 Apr 2021 00:41:57 +0300
Subject: [PATCH 0358/2024] gallery-dl: update to 1.17.2

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

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 2b9e0b000db1..0e339265881a 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
-checksum=b18e822a4d0aa61a4bdb7dd0023b339e5df7370cf9d69724feffe1a6d66714e8
+checksum=a486c10c6d00abe1f7f2d650b0a99d98b8499586d8b1fcd421e6f30420ebf704
 
 do_check() {
 	make test

From 4e02ef57d9a0f4f5adafc0f4a39a4b6216064713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 2 Apr 2021 23:41:42 +0200
Subject: [PATCH 0359/2024] containerd: update to 1.4.4.

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

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index 33f3d27a0613..948e57aa6019 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,6 +1,6 @@
 # Template file for 'containerd'
 pkgname=containerd
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=go
 go_import_path=github.com/containerd/containerd
@@ -20,7 +20,7 @@ maintainer="Paul Knopf <pauldotknopf@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/containerd/containerd"
 distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz"
-checksum=@6069273fb93a162a2a11e29ef3b631c92ed1b4942be461f781a2aabbaed97701
+checksum=ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1
 make_dirs="/var/lib/containerd 0755 root root"
 
 post_build() {

From 9f043d29a5998f8c841a38c031958ce19d66ded9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 2 Apr 2021 22:56:19 +0200
Subject: [PATCH 0360/2024] busybox: add upstream patch for CVE-2021-28831

---
 ...ss_gunzip-Fix-DoS-if-gzip-is-corrupt.patch | 57 +++++++++++++++++++
 srcpkgs/busybox/template                      |  4 +-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch

diff --git a/srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch b/srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
new file mode 100644
index 000000000000..fe973506737d
--- /dev/null
+++ b/srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
@@ -0,0 +1,57 @@
+From dbd3b883a891f076911d752f56f7a906d5650a17 Mon Sep 17 00:00:00 2001
+From: Samuel Sapalski <samuel.sapalski@nokia.com>
+Date: Wed, 3 Mar 2021 16:31:22 +0100
+Subject: [PATCH] decompress_gunzip: Fix DoS if gzip is corrupt
+
+On certain corrupt gzip files, huft_build will set the error bit on
+the result pointer. If afterwards abort_unzip is called huft_free
+might run into a segmentation fault or an invalid pointer to
+free(p).
+
+In order to mitigate this, we check in huft_free if the error bit
+is set and clear it before the linked list is freed.
+
+Signed-off-by: Samuel Sapalski <samuel.sapalski@nokia.com>
+Signed-off-by: Peter Kaestle <peter.kaestle@nokia.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ archival/libarchive/decompress_gunzip.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git archival/libarchive/decompress_gunzip.c archival/libarchive/decompress_gunzip.c
+index 03049cc9b..e0520190a 100644
+--- archival/libarchive/decompress_gunzip.c
++++ archival/libarchive/decompress_gunzip.c
+@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = {
+  * each table.
+  * t: table to free
+  */
++#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
++#define ERR_RET     ((huft_t*)(uintptr_t)1)
+ static void huft_free(huft_t *p)
+ {
+ 	huft_t *q;
+ 
++	/*
++	 * If 'p' has the error bit set we have to clear it, otherwise we might run
++	 * into a segmentation fault or an invalid pointer to free(p)
++	 */
++	if (BAD_HUFT(p)) {
++		p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET));
++	}
++
+ 	/* Go through linked list, freeing from the malloced (t[-1]) address. */
+ 	while (p) {
+ 		q = (--p)->v.t;
+@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current
+  * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table
+  * is given: "fixed inflate" decoder feeds us such data.
+  */
+-#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
+-#define ERR_RET     ((huft_t*)(uintptr_t)1)
+ static huft_t* huft_build(const unsigned *b, const unsigned n,
+ 			const unsigned s, const struct cp_ext *cp_ext,
+ 			unsigned *m)
+-- 
+2.31.1
+
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index de8a606f02df..1d24e7ea1108 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,13 +1,13 @@
 # Template file for 'busybox'
 pkgname=busybox
 version=1.32.1
-revision=1
+revision=2
 hostmakedepends="perl"
 checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
-homepage="http://www.busybox.net"
+homepage="https://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
 checksum=9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee
 

From 4e25c5dc9129a96cc203807f99ec63327a0366b8 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 17:39:55 +0200
Subject: [PATCH 0361/2024] gumbo-parser: rebuild to let packages use dynamic
 library

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

diff --git a/srcpkgs/gumbo-parser/template b/srcpkgs/gumbo-parser/template
index db546f7640f1..c742091fd7d7 100644
--- a/srcpkgs/gumbo-parser/template
+++ b/srcpkgs/gumbo-parser/template
@@ -1,7 +1,7 @@
 # Template file for 'gumbo-parser'
 pkgname=gumbo-parser
 version=0.10.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool"
 checkdepends="gtest-devel"

From 08442463f06d0bdc3cf44271e98dd674cc0dc59a Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 17:40:40 +0200
Subject: [PATCH 0362/2024] httpdirfs: revbump to use dynamic gumbo-parser

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

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 642e893c0435..0028d235c5db 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=4
+revision=5
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 8a54ecf3e25e17c5f52ec4c000feb3cfcccc493f Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 16:35:10 +0200
Subject: [PATCH 0363/2024] mupdf: revbump to use dynamic gumbo-parser

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

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index c8f05d1d3459..1279d8c680d4 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From b70bc6b3aaea3856378d2cbfb8214d3516dc0b30 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 16:35:10 +0200
Subject: [PATCH 0364/2024] FeedReader: revbump to use dynamic gumbo-parser

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

diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template
index 53dc7acb745f..ab71a0c6f042 100644
--- a/srcpkgs/FeedReader/template
+++ b/srcpkgs/FeedReader/template
@@ -1,7 +1,7 @@
 # Template file for 'FeedReader'
 pkgname=FeedReader
 version=2.11.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel intltool itstool pkg-config vala"
 makedepends="gnome-online-accounts-devel gst-plugins-base1-devel json-glib-devel

From 5771c75a386a8635f3b70966ddef2944fb025579 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 16:35:10 +0200
Subject: [PATCH 0365/2024] fbpdf: revbump to use dynamic gumbo-parser

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

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index 805f90a4ca17..ec6965ef45a8 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -1,7 +1,7 @@
 # Template file for 'fbpdf'
 pkgname=fbpdf
 version=0.0.20200616
-revision=1
+revision=2
 _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"

From 35ecbd090d0276547b3d5e12a91a2b6106836eae Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 16:35:11 +0200
Subject: [PATCH 0366/2024] zimwriterfs: revbump to use dynamic gumbo-parser

Closes: #29936 [via git-merge-pr]
---
 srcpkgs/zimwriterfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template
index 5d42e16a119d..bf13bf7e65bc 100644
--- a/srcpkgs/zimwriterfs/template
+++ b/srcpkgs/zimwriterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zimwriterfs'
 pkgname=zimwriterfs
 version=1.3.7
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="file-devel gumbo-parser-devel icu-devel libzim-devel

From d8343932e04350a688b0eccb931368a27b02941b 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, 3 Apr 2021 08:50:31 +0700
Subject: [PATCH 0367/2024] crossguid: remove -O3

---
 srcpkgs/crossguid/patches/no-O3.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/crossguid/patches/no-O3.patch

diff --git a/srcpkgs/crossguid/patches/no-O3.patch b/srcpkgs/crossguid/patches/no-O3.patch
new file mode 100644
index 000000000000..983360a07ccf
--- /dev/null
+++ b/srcpkgs/crossguid/patches/no-O3.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5.1)
+ project(CrossGuid)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+ 
+ option(XG_TESTS "Build test runner" ON)
+ 

From d3030577c8e2785f9fa7de9655320935653429a9 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, 3 Apr 2021 10:59:21 +0700
Subject: [PATCH 0368/2024] openssl: ignore -c_rehash on bootstrapping

---
 srcpkgs/openssl/template | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 3d6db1275ab1..01dfd74de14d 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -26,6 +26,9 @@ build_options=asm
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl"
 	build_options_default="asm"
+else
+	# openssl-c_rehash depends on perl, ignore on bootstrap
+	subpackages="libcrypto1.1 libssl1.1 openssl-devel"
 fi
 
 case $XBPS_TARGET_MACHINE in
@@ -49,6 +52,12 @@ pre_build() {
 	make ${makejobs} depend
 }
 
+post_install() {
+	if [ ! "$CHROOT_READY" ]; then
+		rm -f "${DESTDIR}/usr/bin/c_rehash"
+	fi
+}
+
 libcrypto1.1_package() {
 	short_desc+=" - crypto library"
 	pkg_install() {

From 42a39bc31e71d9570063ee0737e1eb42c0967b5d 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, 3 Apr 2021 11:03:46 +0700
Subject: [PATCH 0369/2024] speed-dreams: mark broken for now

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

diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index df7164f9c808..73344d26ef39 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -28,6 +28,7 @@ nocross=yes
 replaces="speed-dreams-data>=0"
 CFLAGS=-fpermissive
 CXXFLAGS=-fpermissive
+broken="https://build.voidlinux.org/builders/x86_64_builder/builds/31603/steps/shell_3/logs/stdio"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	broken="Segmentation fault"

From bb10d24ec4f5702d2521dfc6eb31eebf6a043adc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 19:52:34 -0700
Subject: [PATCH 0370/2024] flac: fix license, take maintainership

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

diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 1644c37e086e..bc126d52029c 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,19 +1,21 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.3.3
-revision=2
-patch_args="-Np1"
+revision=3
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
---with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
+ --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
 hostmakedepends="pkg-config nasm"
 makedepends="libogg-devel"
 short_desc="Free Lossless Audio Codec"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Colin Booth <colin-void@heliocat.net>"
+license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://flac.sourceforge.net/"
-license="BSD-3-Clause, GPL-2"
 distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
 checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
+patch_args="-Np1"
+# the tests fail when run as root and as such break in the CI containers
+make_check=extended
 
 # TODO: make into options
 case "$XBPS_TARGET_MACHINE" in

From 8712c09b76b875ebdfc66ac41c5950e2cd6164b4 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 1 Apr 2021 05:38:59 -0700
Subject: [PATCH 0371/2024] libinput: update to 1.17.1.

Closes: #29930 [via git-merge-pr]
---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 757347e32a87..9a7244523b00 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.16.4
+version=1.17.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=65923a06d5a8970e4a999c4668797b9b689614b62b1d44432ab1c87b65e39e29
+checksum=e51c50f3ce253961bed452d9f93102cc26128406975ab88ff9ec9e6c3b875137
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"

From c461c17eaf22322fa6988277c08030a182210bc2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 31 Mar 2021 00:55:19 +0300
Subject: [PATCH 0372/2024] nushell: update to 0.29.0

Closes: #29896 [via git-merge-pr]
---
 srcpkgs/nushell/patches/avoid-ring.patch | 325 -----------------------
 srcpkgs/nushell/template                 |  18 +-
 2 files changed, 3 insertions(+), 340 deletions(-)
 delete mode 100644 srcpkgs/nushell/patches/avoid-ring.patch

diff --git a/srcpkgs/nushell/patches/avoid-ring.patch b/srcpkgs/nushell/patches/avoid-ring.patch
deleted file mode 100644
index 09c2752d5c10..000000000000
--- a/srcpkgs/nushell/patches/avoid-ring.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-From 2e58576e6ec9a038a63d7dfb8658a7323acf8931 Mon Sep 17 00:00:00 2001
-From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
-Date: Wed, 10 Mar 2021 15:09:10 -0600
-Subject: [PATCH] move from h1-client-rustls to hyper-client
-
----
- Cargo.lock                        | 174 ++----------------------------
- crates/nu_plugin_fetch/Cargo.toml |   2 +-
- 2 files changed, 7 insertions(+), 169 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 851dff856..a2b5a8c39 100644
---- Cargo.lock
-+++ Cargo.lock
-@@ -204,16 +204,6 @@ dependencies = [
-  "futures-core",
- ]
- 
--[[package]]
--name = "async-dup"
--version = "1.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c"
--dependencies = [
-- "futures-io",
-- "simple-mutex",
--]
--
- [[package]]
- name = "async-executor"
- version = "1.4.0"
-@@ -242,24 +232,7 @@ dependencies = [
-  "futures-lite",
-  "num_cpus",
-  "once_cell",
--]
--
--[[package]]
--name = "async-h1"
--version = "2.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3e9e2a9745d9cd0d92ed7641ce4d07568985762f92633260f0afe8ac7917d9d7"
--dependencies = [
-- "async-channel",
-- "async-dup",
-- "async-std",
-- "byte-pool",
-- "futures-core",
-- "http-types",
-- "httparse",
-- "lazy_static 1.4.0",
-- "log 0.4.14",
-- "pin-project 1.0.4",
-+ "tokio 0.2.24",
- ]
- 
- [[package]]
-@@ -345,19 +318,6 @@ version = "4.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
- 
--[[package]]
--name = "async-tls"
--version = "0.10.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52"
--dependencies = [
-- "futures-core",
-- "futures-io",
-- "rustls",
-- "webpki",
-- "webpki-roots",
--]
--
- [[package]]
- name = "async-trait"
- version = "0.1.42"
-@@ -602,16 +562,6 @@ version = "3.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
- 
--[[package]]
--name = "byte-pool"
--version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e38e98299d518ec351ca016363e0cbfc77059dcd08dfa9700d15e405536097a"
--dependencies = [
-- "crossbeam-queue 0.2.3",
-- "stable_deref_trait",
--]
--
- [[package]]
- name = "byte-tools"
- version = "0.2.0"
-@@ -1045,16 +995,6 @@ dependencies = [
-  "maybe-uninit",
- ]
- 
--[[package]]
--name = "crossbeam-queue"
--version = "0.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
--dependencies = [
-- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.1",
--]
--
- [[package]]
- name = "crossbeam-utils"
- version = "0.6.6"
-@@ -1282,20 +1222,6 @@ version = "2.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
- 
--[[package]]
--name = "deadpool"
--version = "0.7.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d"
--dependencies = [
-- "async-trait",
-- "config",
-- "crossbeam-queue 0.3.1",
-- "num_cpus",
-- "serde 1.0.123",
-- "tokio 1.2.0",
--]
--
- [[package]]
- name = "decimal"
- version = "2.0.4"
-@@ -2331,15 +2257,14 @@ version = "6.3.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "663563ebc56b0bac7e08722cca7742612fd99d9bd6d05cf904ed9d9212065a34"
- dependencies = [
-- "async-h1",
-  "async-std",
-- "async-tls",
-  "async-trait",
-  "cfg-if 1.0.0",
-  "dashmap",
-- "deadpool",
-- "futures 0.3.12",
-+ "futures-util",
-  "http-types",
-+ "hyper 0.13.9",
-+ "hyper-tls",
-  "isahc 0.9.14",
-  "log 0.4.14",
- ]
-@@ -2356,6 +2281,7 @@ dependencies = [
-  "base64 0.13.0",
-  "cookie",
-  "futures-lite",
-+ "http 0.2.3",
-  "infer",
-  "pin-project-lite 0.2.4",
-  "rand 0.7.3",
-@@ -4930,21 +4856,6 @@ version = "1.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560"
- 
--[[package]]
--name = "ring"
--version = "0.16.20"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
--dependencies = [
-- "cc",
-- "libc",
-- "once_cell",
-- "spin",
-- "untrusted",
-- "web-sys",
-- "winapi 0.3.9",
--]
--
- [[package]]
- name = "roxmltree"
- version = "0.14.0"
-@@ -5066,19 +4977,6 @@ dependencies = [
-  "semver 0.9.0",
- ]
- 
--[[package]]
--name = "rustls"
--version = "0.18.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
--dependencies = [
-- "base64 0.12.3",
-- "log 0.4.14",
-- "ring",
-- "sct",
-- "webpki",
--]
--
- [[package]]
- name = "rustversion"
- version = "1.0.4"
-@@ -5209,16 +5107,6 @@ version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
- 
--[[package]]
--name = "sct"
--version = "0.6.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
--dependencies = [
-- "ring",
-- "untrusted",
--]
--
- [[package]]
- name = "security-framework"
- version = "2.0.0"
-@@ -5557,15 +5445,6 @@ dependencies = [
-  "libc",
- ]
- 
--[[package]]
--name = "simple-mutex"
--version = "1.1.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6"
--dependencies = [
-- "event-listener",
--]
--
- [[package]]
- name = "siphasher"
- version = "0.3.3"
-@@ -5649,12 +5528,6 @@ dependencies = [
-  "winapi 0.3.9",
- ]
- 
--[[package]]
--name = "spin"
--version = "0.5.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
--
- [[package]]
- name = "spinning_top"
- version = "0.2.2"
-@@ -6201,16 +6074,6 @@ dependencies = [
-  "tokio-macros",
- ]
- 
--[[package]]
--name = "tokio"
--version = "1.2.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a"
--dependencies = [
-- "autocfg",
-- "pin-project-lite 0.2.4",
--]
--
- [[package]]
- name = "tokio-codec"
- version = "0.1.2"
-@@ -6371,7 +6234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
- dependencies = [
-  "crossbeam-deque 0.7.3",
-- "crossbeam-queue 0.2.3",
-+ "crossbeam-queue",
-  "crossbeam-utils 0.7.2",
-  "futures 0.1.30",
-  "lazy_static 1.4.0",
-@@ -6633,12 +6496,6 @@ dependencies = [
-  "subtle",
- ]
- 
--[[package]]
--name = "untrusted"
--version = "0.7.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
--
- [[package]]
- name = "url"
- version = "2.2.1"
-@@ -6903,25 +6760,6 @@ dependencies = [
-  "wasm-bindgen",
- ]
- 
--[[package]]
--name = "webpki"
--version = "0.21.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
--dependencies = [
-- "ring",
-- "untrusted",
--]
--
--[[package]]
--name = "webpki-roots"
--version = "0.20.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
--dependencies = [
-- "webpki",
--]
--
- [[package]]
- name = "weezl"
- version = "0.1.3"
-diff --git a/crates/nu_plugin_fetch/Cargo.toml b/crates/nu_plugin_fetch/Cargo.toml
-index ddb62e9e4..8c112e37c 100644
---- crates/nu_plugin_fetch/Cargo.toml
-+++ crates/nu_plugin_fetch/Cargo.toml
-@@ -16,7 +16,7 @@ nu-errors = { path = "../nu-errors", version = "0.28.0" }
- nu-plugin = { path = "../nu-plugin", version = "0.28.0" }
- nu-protocol = { path = "../nu-protocol", version = "0.28.0" }
- nu-source = { path = "../nu-source", version = "0.28.0" }
--surf = { version = "2.2.0", features = ["h1-client-rustls"] }
-+surf = { version = "2.2.0", features = ["hyper-client"] }
- url = "2.2.1"
- mime = "0.3.16"
- 
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 1f699bc73d75..49a1ea9527ff 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.28.0
-revision=2
+version=0.29.0
+revision=1
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
@@ -12,23 +12,11 @@ license="MIT"
 homepage="https://www.nushell.sh/"
 changelog="https://www.nushell.sh/blog/"
 distfiles="https://github.com/nushell/nushell/archive/${version}.tar.gz"
-checksum=aa6769f614a031ad33738064030d1c0d9ab500b2b0924adca71edacb1bd1d85d
+checksum=1572c5e48c7b460e1693eb4dd153902cfff9b5069abd05297b79563e6ffbf9f1
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no
 
-post_patch() {
-	# pull in updates for https://github.com/alkis/decimal
-	# the latest release (2.0.4) is missing fixes needed for
-	# platforms with unsigned char type; pin it to a specific
-	# revision until a new release is made
-	#
-	# remove this post_patch once that has happened
-	echo '[patch.crates-io.decimal]' >> Cargo.toml
-	echo 'git = "https://github.com/alkis/decimal"' >> Cargo.toml
-	echo 'rev = "c27d9a165afc55ec98fb4db79b12841df578387e"' >> Cargo.toml
-}
-
 post_install() {
 	vlicense LICENSE
 }

From d458a5dcd0994399431fa54ad58570b13fa59186 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 30 Mar 2021 01:35:53 +0200
Subject: [PATCH 0373/2024] ccache: update to 4.2.1.

Closes: #29867 [via git-merge-pr]
---
 srcpkgs/ccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index c7b94db6d679..bb9dde861f67 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,6 +1,6 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=4.2
+version=4.2.1
 revision=1
 bootstrap=yes
 build_style=cmake
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://ccache.samba.org/"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=2f14b11888c39778c93814fc6843fc25ad60ff6ba4eeee3dff29a1bad67ba94f
+checksum=9d6ba1cdefdc690401f404b747d81a9a1802b17af4235815866b7620d980477e
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"

From 0b273ed4e4b2c842f66c4546e359ab3af2ecac44 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 16 Mar 2021 00:49:24 +0100
Subject: [PATCH 0374/2024] wabt: update to 1.0.23.

Closes: #29500 [via git-merge-pr]
---
 srcpkgs/wabt/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/wabt/template b/srcpkgs/wabt/template
index 752dfd31e6b3..0a025a820edc 100644
--- a/srcpkgs/wabt/template
+++ b/srcpkgs/wabt/template
@@ -1,6 +1,6 @@
 # Template file for 'wabt'
 pkgname=wabt
-version=1.0.20
+version=1.0.23
 revision=1
 build_style=cmake
 make_check_target=check
@@ -9,19 +9,19 @@ short_desc="WebAssembly Binary Toolkit"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/WebAssembly/wabt"
-_gtest_commit=7888184f28509dba839e3683409443e0b5bb8948
-_testsuite_commit=18f83401a47a0e43772cf7d9f216e994bf7c7fa6
+_gtest_commit=703bd9caab50b139428cea1aaff9974ebee5742e
+_testsuite_commit=9994915e0cca8b42a16c577e4c85491822367dde
 _wasm_c_api_commit=d9a80099d496b5cdba6f3fe8fc77586e0e505ddc
 distfiles="https://github.com/WebAssembly/wabt/archive/${version}.tar.gz
  https://github.com/google/googletest/archive/${_gtest_commit}.tar.gz
  https://github.com/WebAssembly/testsuite/archive/${_testsuite_commit}.tar.gz
  https://github.com/WebAssembly/wasm-c-api/archive/${_wasm_c_api_commit}.tar.gz"
-checksum="39def40e8719030e0d11b1abbd81427fb1731c0372fcb24e2baaea067acba66f
- acc72b0cde04828fd4640576fdbd0727fc202f08b7701ae0bb318e2510f44b22
- 9d82be5b4dcfaadb9c0b0455c0c8b2989b942f75b9f698fa8e70329e403f4f74
+checksum="925f47020705cd2cc00a4ff6a36ab08f8adf6d08c7eac5057db0db38b6b2f16d
+ d17b1b83a57b3933565a6d0616fe261107326d47de20288d0949ed038e1c342d
+ baf8a7f68ddd21fb7ad255acc765391c972c12f3857af8e9a979342b160e6a5a
  aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c"
 
-pre_configure() {
+post_extract() {
 	# move submodule to proper location
 	rmdir third_party/gtest
 	rmdir third_party/testsuite

From 60292bd59180a1e9934f37aace1e961974551cf1 Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Tue, 9 Mar 2021 22:55:24 +0100
Subject: [PATCH 0375/2024] pango: update to 1.48.4

Add some fonts to pass tests.

Still printed during build:

1. /usr/include/features.h:397:4:
warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]

2. pangofc.pc was not found in the pkg-config search patch

By ericonr: bumb to 1.48.4

Closes: #29361 [via git-merge-pr]
---
 srcpkgs/pango/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 2b4a70d0d776..2ecd0a05a641 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,18 +1,20 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.48.0
-revision=2
+version=1.48.4
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel help2man pkg-config"
 makedepends="fribidi-devel harfbuzz-devel libXft-devel libthai-devel"
+checkdepends="liberation-fonts-ttf cantarell-fonts"
 short_desc="Library for layout and rendering of text"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
+changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6
+checksum=418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a
 
 # Package build options
 build_options="gir"
@@ -26,7 +28,7 @@ post_install() {
 pango-xft_package() {
 	short_desc+=" - X font rendering"
 	pkg_install() {
-		vmove usr/lib/libpangoxft*.so.*
+		vmove "usr/lib/libpangoxft*.so.*"
 		if [ "$build_option_gir" ]; then
 			vmove usr/lib/girepository-1.0/PangoXft-1.0.typelib
 		fi

From eddb81442f1a6700ec925ea5cd1d442f34883a43 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 13 Mar 2021 17:26:59 +1100
Subject: [PATCH 0376/2024] mbedtls: update to 2.16.10

Also:
- Fix changelog location.
- Use scripts/config.pl instead of sed.

Closes: #29430 [via git-merge-pr]
---
 srcpkgs/mbedtls/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 4793fa29f240..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.9
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -11,15 +11,13 @@ short_desc="Portable cryptographic TLS library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://tls.mbed.org/"
-changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/development/ChangeLog"
+changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=b7ca99ee10551b5b13242b7effebefd2a5cc38c287e5f5be1267d51ee45effe3
-
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
-	sed -i include/mbedtls/config.h \
-		-e 's/.*\(#define MBEDTLS_THREADING_C\)/\1/' \
-		-e 's/.*\(#define MBEDTLS_THREADING_PTHREAD\)/\1/'
+	./scripts/config.pl set MBEDTLS_THREADING_C
+	./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
 }
 
 mbedtls-utils_package() {

From 8189d4171b7c6c2d4426b75dae4f7c9a04986822 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 14:50:43 +0300
Subject: [PATCH 0377/2024] olm: update to 3.2.2

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

diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template
index 39aabed41d32..8af7a1520f24 100644
--- a/srcpkgs/olm/template
+++ b/srcpkgs/olm/template
@@ -1,6 +1,6 @@
 # Template file for 'olm'
 pkgname=olm
-version=3.2.1
+version=3.2.2
 revision=1
 build_style=cmake
 short_desc="Implementation of the Double Ratchet cryptographic ratchet"
@@ -8,7 +8,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=a0482f8c8e80eb11578e8a8655b677fe943b86ac33affd46d67dff4261afeb6a
+checksum=a180af4bcdfcd4b8f3e4aa306869d80f7610c81f651347e8e71bd03c31a2b697
 
 do_check() {
 	cd build/tests

From 8da0a07fc1b04ab677a9a0a444279fc889dce7b7 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 14:54:09 +0300
Subject: [PATCH 0378/2024] olm-python3: update to 3.2.2

Disable tests.

Closes: #29312 [via git-merge-pr]
---
 srcpkgs/olm-python3/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/olm-python3/template b/srcpkgs/olm-python3/template
index 2ac1d725ac7e..8ebb131e0978 100644
--- a/srcpkgs/olm-python3/template
+++ b/srcpkgs/olm-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'olm-python3'
 pkgname=olm-python3
-version=3.2.1
+version=3.2.2
 revision=1
 wrksrc="olm-${version}"
 build_wrksrc=python
@@ -14,7 +14,9 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=a0482f8c8e80eb11578e8a8655b677fe943b86ac33affd46d67dff4261afeb6a
+checksum=a180af4bcdfcd4b8f3e4aa306869d80f7610c81f651347e8e71bd03c31a2b697
+# requires unpackaged pytest-{benchmark,isort}
+make_check=no
 
 pre_build() {
 	make include/olm/olm.h

From 2c4b08ded519fddc8e6781292b80cce709b83923 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 8 Mar 2021 19:50:17 +0100
Subject: [PATCH 0379/2024] hitch: update to 1.7.0.

Merging with known test failure on musl:
FAIL tests/test39-client-cert-proxy.sh (exit status: 1)

It's a test introduced with this update, and Alpine is shipping this
version, so made the decision to go ahead with the update.

Closes: #29351 [via git-merge-pr]
---
 srcpkgs/hitch/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 2ccae03e3065..805170a687f6 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,7 +1,7 @@
 # Template file for 'hitch'
 pkgname=hitch
-version=1.5.2
-revision=3
+version=1.7.0
+revision=1
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
@@ -12,11 +12,9 @@ maintainer="Jannis Christ <hello@jannis.ovh>"
 license="BSD-2-Clause"
 homepage="https://hitch-tls.org/"
 distfiles="https://hitch-tls.org/source/hitch-${version}.tar.gz"
-checksum=b1a4fd64584cd4ff816b8513ee5522db34a4431747057421b6e870f722c6dfda
+checksum=c97ef8f1e115156640c40dfdfe9662d5f6d57a796fccad3bbad198ec797ce5c4
 system_accounts="_hitch"
 
-CFLAGS="-fcommon"
-
 post_patch() {
 	vsed -i -e "s/grep -Pq/grep -q/" -e 's/\\t/\t/' \
 		src/tests/test32-proxy-authority.sh

From 391764c2c026956be5b7600eec0687e42e12d07e Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 10 Mar 2021 15:40:05 +0100
Subject: [PATCH 0380/2024] python3-s-tui: update to 1.1.1.

Closes: #29377 [via git-merge-pr]
---
 srcpkgs/python3-s-tui/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-s-tui/template b/srcpkgs/python3-s-tui/template
index 3c7fec4c6e8f..ae57dfc0ebee 100644
--- a/srcpkgs/python3-s-tui/template
+++ b/srcpkgs/python3-s-tui/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-s-tui'
 pkgname=python3-s-tui
-version=1.0.2
-revision=2
+version=1.1.1
+revision=1
 wrksrc="s-tui-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools stress python3-urwid python3-psutil"
+checkdepends="$depends"
 short_desc="Terminal based CPU stress and monitoring utility"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://amanusk.github.io/s-tui"
 distfiles="https://github.com/amanusk/s-tui/archive/v${version}.tar.gz"
-checksum=0906db4b87f6b68a41c05102be35e47ed7dcf01cd69ec2cc155bd847e84bee0b
+checksum=d999f40e7809b84b45c1c01aff76cf4fc37a058a92c6c8b80c1098941842d0de

From 02406e472acd8f0c9efba8d0e970354eb11b5641 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, 3 Apr 2021 15:34:55 +0700
Subject: [PATCH 0381/2024] dcraw: upstream moved

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

diff --git a/srcpkgs/dcraw/template b/srcpkgs/dcraw/template
index 66b968d556eb..67cb2f426ef1 100644
--- a/srcpkgs/dcraw/template
+++ b/srcpkgs/dcraw/template
@@ -8,8 +8,8 @@ makedepends="jasper-devel lcms2-devel"
 short_desc="Convert raw photos"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="GPL-2.0-or-later"
-homepage="https://www.cybercom.net/~dcoffin/dcraw/"
-distfiles="https://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${version}.tar.gz"
+homepage="https://www.dechifro.org/dcraw/"
+distfiles="https://www.dechifro.org/dcraw/archive/${pkgname}-${version}.tar.gz"
 checksum=2890c3da2642cd44c5f3bfed2c9b2c1db83da5cec09cc17e0fa72e17541fb4b9
 
 do_build() {

From 2e96e9de5e409922fc625892fdafbe9db5430ed8 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, 3 Apr 2021 15:08:33 +0700
Subject: [PATCH 0382/2024] speed-dreams: fix build with cmake 3.20

---
 srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ++++++++++++++++++
 srcpkgs/speed-dreams/template                 |   4 +-
 2 files changed, 358 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch

diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch
new file mode 100644
index 000000000000..5e2334117d32
--- /dev/null
+++ b/srcpkgs/speed-dreams/patches/cmake-3.20.patch
@@ -0,0 +1,356 @@
+Index: cmake/robot.cmake
+===================================================================
+--- cmake/robot.cmake.orig
++++ cmake/robot.cmake
+@@ -229,7 +229,7 @@ ENDMACRO(ROBOT_MODULE)
+ #  
+ MACRO(ROBOT_DATA)
+ 
+-  SET(RBD_SYNTAX "NAME,1,1,RBD_HAS_NAME,RBD_NAME")
++  SET(RBD_SYNTAX "RNAME,1,1,RBD_HAS_NAME,RBD_NAME")
+   SET(RBD_SYNTAX ${RBD_SYNTAX} "PREFIX,0,1,RBD_HAS_PREFIX,RBD_PREFIX")
+   SET(RBD_SYNTAX ${RBD_SYNTAX} "FILES,0,-1,RBD_HAS_FILES,RBD_FILES")
+   SET(RBD_SYNTAX ${RBD_SYNTAX} "SUBDIRS,0,-1,RBD_HAS_SUBDIRS,RBD_SUBDIRS")
+@@ -311,6 +311,6 @@ MACRO(ROBOT)
+ 
+   ROBOT_MODULE(NAME ${RB_NAME} INTERFACE ${RB_INTERFACE} SOURCES ${RB_SOURCES})
+ 
+-  ROBOT_DATA(NAME ${RB_NAME} PREFIX ${RB_PREFIX} FILES ${RB_FILES} SUBDIRS ${RB_SUBDIRS})
++  ROBOT_DATA(RNAME ${RB_NAME} PREFIX ${RB_PREFIX} FILES ${RB_FILES} SUBDIRS ${RB_SUBDIRS})
+ 
+ ENDMACRO(ROBOT)
+Index: data/drivers/dandroid_36GP/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_36GP/CMakeLists.txt.orig
++++ data/drivers/dandroid_36GP/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   36gp-tridenti-6c34 36gp-tridenti-v8ri
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_36GP
++ROBOT_DATA(RNAME dandroid_36GP
+            FILES dandroid_36GP.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_ls1/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_ls1/CMakeLists.txt.orig
++++ data/drivers/dandroid_ls1/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   ls1-taipan-ltsr ls1-marisatech-gt4r
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_ls1
++ROBOT_DATA(RNAME dandroid_ls1
+            FILES dandroid_ls1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_ls2/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_ls2/CMakeLists.txt.orig
++++ data/drivers/dandroid_ls2/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   ls2-cavallo-360r ls2-morley-r900 ls2-vulture-v6rs2
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_ls2
++ROBOT_DATA(RNAME dandroid_ls2
+            FILES dandroid_ls2.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_mpa1/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_mpa1/CMakeLists.txt.orig
++++ data/drivers/dandroid_mpa1/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
+                   mpa1-team-lynx mpa1-ffr
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_mpa1
++ROBOT_DATA(RNAME dandroid_mpa1
+            FILES dandroid_mpa1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_rs/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_rs/CMakeLists.txt.orig
++++ data/drivers/dandroid_rs/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
+                   rs2-fai-dot rs2-lion-2m
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_rs
++ROBOT_DATA(RNAME dandroid_rs
+            FILES dandroid_rs.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_sc/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_sc/CMakeLists.txt.orig
++++ data/drivers/dandroid_sc/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   sc-lynx-220 sc-murasama-nsx sc-kanagawa-z35gts sc-kongei-kk8s
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_sc
++ROBOT_DATA(RNAME dandroid_sc
+            FILES dandroid_sc.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_srw/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_srw/CMakeLists.txt.orig
++++ data/drivers/dandroid_srw/CMakeLists.txt
+@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7
+                   srw-kanagawa-gtr
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_srw
++ROBOT_DATA(RNAME dandroid_srw
+            FILES dandroid_srw.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/dandroid_trb1/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_trb1/CMakeLists.txt.orig
++++ data/drivers/dandroid_trb1/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   trb1-zaxxon-rb trb1-vieringe-5rb
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_trb1
++ROBOT_DATA(RNAME dandroid_trb1
+            FILES dandroid_trb1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/human/CMakeLists.txt
+===================================================================
+--- data/drivers/human/CMakeLists.txt.orig
++++ data/drivers/human/CMakeLists.txt
+@@ -2,10 +2,10 @@ INCLUDE(../../../cmake/macros.cmake)
+ 
+ SET(ROBOT_NAME "human")
+ 
+-ROBOT_DATA(NAME ${ROBOT_NAME}
++ROBOT_DATA(RNAME ${ROBOT_NAME}
+            FILES logo.png logo.rgb
+            SUBDIRS cars PATTERNS *.xml)
+ 
+-ROBOT_DATA(NAME ${ROBOT_NAME}
++ROBOT_DATA(RNAME ${ROBOT_NAME}
+            FILES ${ROBOT_NAME}.xml preferences.xml car.xml
+            USER)
+Index: data/drivers/networkhuman/CMakeLists.txt
+===================================================================
+--- data/drivers/networkhuman/CMakeLists.txt.orig
++++ data/drivers/networkhuman/CMakeLists.txt
+@@ -2,10 +2,10 @@ INCLUDE(../../../cmake/macros.cmake)
+ 
+ SET(ROBOT_NAME "networkhuman")
+ 
+-ROBOT_DATA(NAME ${ROBOT_NAME}
++ROBOT_DATA(RNAME ${ROBOT_NAME}
+            FILES logo.png)
+ #           SUBDIRS cars PATTERNS *.xml)
+ 
+-ROBOT_DATA(NAME ${ROBOT_NAME}
++ROBOT_DATA(RNAME ${ROBOT_NAME}
+            FILES ${ROBOT_NAME}.xml preferences.xml car.xml
+            USER)
+Index: data/drivers/shadow_sc/CMakeLists.txt
+===================================================================
+--- data/drivers/shadow_sc/CMakeLists.txt.orig
++++ data/drivers/shadow_sc/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9
+                   sc-lynx-220 sc-murasama-nsx sc-spirit-300 
+                   tracks)
+ 
+-ROBOT_DATA(NAME shadow_sc
++ROBOT_DATA(RNAME shadow_sc
+            FILES shadow_sc.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix/CMakeLists.txt.orig
++++ data/drivers/simplix/CMakeLists.txt
+@@ -10,6 +10,6 @@ SET(ROBOT_SUBDIRS trb1-cavallo-360rb
+                   tracks
+                   0)
+ 
+-ROBOT_DATA(NAME simplix
++ROBOT_DATA(RNAME simplix
+            FILES simplix.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml *.rgb)
+Index: data/drivers/simplix_36GP/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_36GP/CMakeLists.txt.orig
++++ data/drivers/simplix_36GP/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
+                   36gp-tridenti-6c34 36gp-tridenti-v8ri
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_36GP
++ROBOT_DATA(RNAME simplix_36GP
+            FILES simplix_36GP.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_ls1/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_ls1/CMakeLists.txt.orig
++++ data/drivers/simplix_ls1/CMakeLists.txt
+@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   ls1-taipan-ltsr
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_ls1
++ROBOT_DATA(RNAME simplix_ls1
+            FILES simplix_ls1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_ls2/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_ls2/CMakeLists.txt.orig
++++ data/drivers/simplix_ls2/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0
+                   ls2-bavaria-g3gtr
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_ls2
++ROBOT_DATA(RNAME simplix_ls2
+            FILES simplix_ls2.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_mp5/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_mp5/CMakeLists.txt.orig
++++ data/drivers/simplix_mp5/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5
+                   mp5-fmc mp5-fmc-drift mp5-fmc-speedy
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_mp5
++ROBOT_DATA(RNAME simplix_mp5
+            FILES simplix_mp5.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_mpa1/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_mpa1/CMakeLists.txt.orig
++++ data/drivers/simplix_mpa1/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
+                   mpa1-team-lynx mpa1-ffr
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_mpa1
++ROBOT_DATA(RNAME simplix_mpa1
+            FILES simplix_mpa1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_sc/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_sc/CMakeLists.txt.orig
++++ data/drivers/simplix_sc/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   sc-lynx-220 sc-murasama-nsx
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_sc
++ROBOT_DATA(RNAME simplix_sc
+            FILES simplix_sc.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_srw/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_srw/CMakeLists.txt.orig
++++ data/drivers/simplix_srw/CMakeLists.txt
+@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7
+                   srw-kanagawa-gtr
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_srw
++ROBOT_DATA(RNAME simplix_srw
+            FILES simplix_srw.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_trb1/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_trb1/CMakeLists.txt.orig
++++ data/drivers/simplix_trb1/CMakeLists.txt
+@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   trb1-zaxxon-rb trb1-vieringe-5rb
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_trb1
++ROBOT_DATA(RNAME simplix_trb1
+            FILES simplix_trb1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_36GP/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_36GP/CMakeLists.txt.orig
++++ data/drivers/usr_36GP/CMakeLists.txt
+@@ -8,7 +8,7 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
+                   36gp-tridenti-v8ri
+                   tracks)
+ 
+-ROBOT_DATA(NAME usr_36GP
++ROBOT_DATA(RNAME usr_36GP
+            FILES usr_36GP.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+ 
+Index: data/drivers/usr_ls1/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_ls1/CMakeLists.txt.orig
++++ data/drivers/usr_ls1/CMakeLists.txt
+@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
+                   ls1-taipan-ltsr ls1-toro-rgt
+                   tracks)
+ 
+-ROBOT_DATA(NAME usr_ls1
++ROBOT_DATA(RNAME usr_ls1
+            FILES usr_ls1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_ls2/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_ls2/CMakeLists.txt.orig
++++ data/drivers/usr_ls2/CMakeLists.txt
+@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8
+ 		  ls2-vortex-gt ls2-lynx-xkr
+                   )
+ 
+-ROBOT_DATA(NAME usr_ls2
++ROBOT_DATA(RNAME usr_ls2
+            FILES usr_ls2.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_mpa1/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_mpa1/CMakeLists.txt.orig
++++ data/drivers/usr_mpa1/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 #9 10
+                   mpa1-ffr mpa1-furia mpa1-hartbill-2002
+                   mpa1-murasama mpa1-team-lynx)
+ 
+-ROBOT_DATA(NAME usr_mpa1
++ROBOT_DATA(RNAME usr_mpa1
+            FILES usr_mpa1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_rs/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_rs/CMakeLists.txt.orig
++++ data/drivers/usr_rs/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 1
+                   rs1-kenji-08
+                   )
+ 
+-ROBOT_DATA(NAME usr_rs
++ROBOT_DATA(RNAME usr_rs
+            FILES usr_rs.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_sc/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_sc/CMakeLists.txt.orig
++++ data/drivers/usr_sc/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
+                   sc-lynx-220 sc-murasama-nsx sc-spirit-300 
+                   tracks)
+ 
+-ROBOT_DATA(NAME usr_sc
++ROBOT_DATA(RNAME usr_sc
+            FILES usr_sc.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_trb1/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_trb1/CMakeLists.txt.orig
++++ data/drivers/usr_trb1/CMakeLists.txt
+@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
+                   trb1-zaxxon-rb
+                   tracks)
+ 
+-ROBOT_DATA(NAME usr_trb1
++ROBOT_DATA(RNAME usr_trb1
+            FILES usr_trb1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 73344d26ef39..fadabc891c88 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -7,7 +7,7 @@ _rev=r6553
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2
- -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON"
+ -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON -Wno-dev"
 hostmakedepends="pkg-config"
 makedepends="freealut-devel libenet-devel libfreeglut-devel libjpeg-turbo-devel
  libpng-devel libvorbis-devel libXrandr-devel osg-devel plib-devel SDL2-devel
@@ -28,7 +28,7 @@ nocross=yes
 replaces="speed-dreams-data>=0"
 CFLAGS=-fpermissive
 CXXFLAGS=-fpermissive
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/31603/steps/shell_3/logs/stdio"
+lib32disabled=yes
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	broken="Segmentation fault"

From b336c387285d9f0698b37332e502bade7f920569 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, 3 Apr 2021 17:38:16 +0700
Subject: [PATCH 0383/2024] libogdf: fix libdir

---
 srcpkgs/libogdf/patches/libdir.patch | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/libogdf/patches/libdir.patch

diff --git a/srcpkgs/libogdf/patches/libdir.patch b/srcpkgs/libogdf/patches/libdir.patch
new file mode 100644
index 000000000000..511064d40f04
--- /dev/null
+++ b/srcpkgs/libogdf/patches/libdir.patch
@@ -0,0 +1,32 @@
+Index: OGDF-snapshot/cmake/coin.cmake
+===================================================================
+--- OGDF-snapshot.orig/cmake/coin.cmake
++++ OGDF-snapshot/cmake/coin.cmake
+@@ -55,9 +55,9 @@ else()
+ endif()
+ 
+ # installation
+-set(COIN_INSTALL_LIBRARY_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path of COIN library")
++set(COIN_INSTALL_LIBRARY_DIR "lib" CACHE PATH "Installation path of COIN library")
+ set(COIN_INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation path of COIN header files (creates subdirectory)")
+-set(COIN_INSTALL_CMAKE_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/OGDF/" CACHE PATH "Installation path of COIN files for CMake")
++set(COIN_INSTALL_CMAKE_DIR "lib/cmake/OGDF/" CACHE PATH "Installation path of COIN files for CMake")
+ mark_as_advanced(COIN_INSTALL_LIBRARY_DIR COIN_INSTALL_INCLUDE_DIR COIN_INSTALL_CMAKE_DIR)
+ install(TARGETS COIN
+   EXPORT CoinTargets
+Index: OGDF-snapshot/cmake/ogdf.cmake
+===================================================================
+--- OGDF-snapshot.orig/cmake/ogdf.cmake
++++ OGDF-snapshot/cmake/ogdf.cmake
+@@ -166,9 +166,9 @@ if(SHOW_STACKTRACE)
+ endif()
+ 
+ # installation
+-set(OGDF_INSTALL_LIBRARY_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path of OGDF library")
++set(OGDF_INSTALL_LIBRARY_DIR "lib" CACHE PATH "Installation path of OGDF library")
+ set(OGDF_INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation path of OGDF header files (creates subdirectory)")
+-set(OGDF_INSTALL_CMAKE_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/OGDF/" CACHE PATH "Installation path of OGDF files for CMake")
++set(OGDF_INSTALL_CMAKE_DIR "lib/cmake/OGDF/" CACHE PATH "Installation path of OGDF files for CMake")
+ mark_as_advanced(OGDF_INSTALL_LIBRARY_DIR OGDF_INSTALL_INCLUDE_DIR OGDF_INSTALL_CMAKE_DIR)
+ configure_file(cmake/ogdf-config.cmake "${PROJECT_BINARY_DIR}/ogdf-config.cmake" @ONLY)
+ install(TARGETS OGDF

From d0a46d2947b68532cc57616254d2590c1a87569e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 13 Mar 2021 17:39:19 +0100
Subject: [PATCH 0384/2024] bfs: update to 2.2.

---
 ...pabilities-when-run-as-root-on-Linux.patch | 90 +++++++++++++++++++
 ...ing-forever-when-failing-to-drop-cap.patch | 41 +++++++++
 ...emove-capabilities-after-dropping-th.patch | 47 ++++++++++
 srcpkgs/bfs/template                          |  6 +-
 4 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
 create mode 100644 srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
 create mode 100644 srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch

diff --git a/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch b/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
new file mode 100644
index 000000000000..a2e54c397f8b
--- /dev/null
+++ b/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
@@ -0,0 +1,90 @@
+From f2e6186ed0ce9b68362ad25d897f1e3c697728ec Mon Sep 17 00:00:00 2001
+From: Tavian Barnes <tavianator@tavianator.com>
+Date: Sun, 21 Mar 2021 13:18:43 -0400
+Subject: [PATCH] tests: Drop capabilities when run as root on Linux
+
+bfs's tests rely on file permissions being enforced, which leads them to
+work incorrectly when run as root.  This is probably the most common
+packaging issue for bfs, most recently seen with Void Linux's update to
+bfs 2.2.
+
+Make it easier on packagers by using capsh, if it's available, to drop
+the DAC privileges for the tests.
+
+Link: https://github.com/void-linux/void-packages/pull/29437#issuecomment-798670288
+Link: https://salsa.debian.org/lamby/pkg-bfs/-/commit/b173efb35da126adb39b0984219d6a2fd9ff428f
+---
+ tests.sh | 35 +++++++++++++++++++++++++++++------
+ 1 file changed, 29 insertions(+), 6 deletions(-)
+
+diff --git tests.sh tests.sh
+index b039eea..0bdd1d4 100755
+--- tests.sh
++++ tests.sh
+@@ -34,10 +34,25 @@ if [ -t 1 ]; then
+     RST="$(printf '\033[0m')"
+ fi
+ 
+-if [ "$EUID" -eq 0 ]; then
++if command -v capsh &>/dev/null; then
++    if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
++        cat >&2 <<EOF
++${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
++${BLD}CAP_DAC_READ_SEARCH${RST}.
++
++EOF
++
++        exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
++    fi
++elif [ "$EUID" -eq 0 ]; then
++    UNLESS=
++    if [ "$(uname)" = "Linux" ]; then
++	UNLESS=" unless ${GRN}capsh${RST} is installed"
++    fi
++
+     cat >&2 <<EOF
+ ${RED}error:${RST} These tests expect filesystem permissions to be enforced, and therefore
+-will not work when run as ${BLD}$(id -un)${RST}.
++will not work when run as ${BLD}$(id -un)${RST}${UNLESS}.
+ EOF
+     exit 1
+ fi
+@@ -1209,11 +1224,15 @@ function test_gid() {
+ }
+ 
+ function test_gid_plus() {
+-    bfs_diff basic -gid +0
++    if [ "$(id -g)" -ne 0 ]; then
++	bfs_diff basic -gid +0
++    fi
+ }
+ 
+ function test_gid_plus_plus() {
+-    bfs_diff basic -gid +0
++    if [ "$(id -g)" -ne 0 ]; then
++	bfs_diff basic -gid ++0
++    fi
+ }
+ 
+ function test_gid_minus() {
+@@ -1229,11 +1248,15 @@ function test_uid() {
+ }
+ 
+ function test_uid_plus() {
+-    bfs_diff basic -uid +0
++    if [ "$(id -u)" -ne 0 ]; then
++	bfs_diff basic -uid +0
++    fi
+ }
+ 
+ function test_uid_plus_plus() {
+-    bfs_diff basic -uid ++0
++    if [ "$(id -u)" -ne 0 ]; then
++	bfs_diff basic -uid ++0
++    fi
+ }
+ 
+ function test_uid_minus() {
+-- 
+2.31.0
+
diff --git a/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch b/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
new file mode 100644
index 000000000000..5e951faea29c
--- /dev/null
+++ b/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
@@ -0,0 +1,41 @@
+From dbc77fd3b6e48a17eb79f9ff3a5f810b7554bf6f Mon Sep 17 00:00:00 2001
+From: Tavian Barnes <tavianator@tavianator.com>
+Date: Mon, 22 Mar 2021 17:19:31 -0400
+Subject: [PATCH] tests: Avoid looping forever when failing to drop
+ capabilities
+
+Link: https://github.com/void-linux/void-packages/pull/29437/checks?check_run_id=2169825021
+---
+ tests.sh | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git tests.sh tests.sh
+index 0bdd1d4..ad71894 100755
+--- tests.sh
++++ tests.sh
+@@ -36,13 +36,21 @@ fi
+ 
+ if command -v capsh &>/dev/null; then
+     if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
++	if [ -n "$BFS_TRIED_DROP" ]; then
++            cat >&2 <<EOF
++${RED}error: ${RST} Failed to drop capabilities.
++EOF
++
++	    exit 1
++	fi
++
+         cat >&2 <<EOF
+ ${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
+ ${BLD}CAP_DAC_READ_SEARCH${RST}.
+ 
+ EOF
+ 
+-        exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
++        BFS_TRIED_DROP=y exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
+     fi
+ elif [ "$EUID" -eq 0 ]; then
+     UNLESS=
+-- 
+2.31.0
+
diff --git a/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch b/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch
new file mode 100644
index 000000000000..acf3d32f9113
--- /dev/null
+++ b/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch
@@ -0,0 +1,47 @@
+From d36ece2ca7498b7ba5485d5010439b57f006c9c8 Mon Sep 17 00:00:00 2001
+From: Tavian Barnes <tavianator@tavianator.com>
+Date: Tue, 23 Mar 2021 11:46:26 -0400
+Subject: [PATCH] tests: Actually remove capabilities after dropping them
+
+---
+ tests.sh | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git tests.sh tests.sh
+index ad71894..8eb4dc0 100755
+--- tests.sh
++++ tests.sh
+@@ -35,22 +35,25 @@ if [ -t 1 ]; then
+ fi
+ 
+ if command -v capsh &>/dev/null; then
+-    if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
++    if capsh --has-p=cap_dac_override &>/dev/null || capsh --has-p=cap_dac_read_search &>/dev/null; then
+ 	if [ -n "$BFS_TRIED_DROP" ]; then
+             cat >&2 <<EOF
+-${RED}error: ${RST} Failed to drop capabilities.
++${RED}error:${RST} Failed to drop capabilities.
+ EOF
+ 
+ 	    exit 1
+ 	fi
+ 
+         cat >&2 <<EOF
+-${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
+-${BLD}CAP_DAC_READ_SEARCH${RST}.
++${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}cap_dac_override${RST} and
++${BLD}cap_dac_read_search${RST}.
+ 
+ EOF
+ 
+-        BFS_TRIED_DROP=y exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
++        BFS_TRIED_DROP=y exec capsh \
++            --drop=cap_dac_override,cap_dac_read_search \
++            --caps=cap_dac_override,cap_dac_read_search-eip \
++            -- "$0" "$@"
+     fi
+ elif [ "$EUID" -eq 0 ]; then
+     UNLESS=
+-- 
+2.31.1
+
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index 68ccaff63a4c..ebc526cec78f 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,17 +1,17 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.1
+version=2.2
 revision=1
 build_style=gnu-makefile
 makedepends="acl-devel libcap-devel"
-checkdepends="acl-progs"
+checkdepends="acl-progs libcap-progs"
 short_desc="Breadth-first version of the UNIX find command"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="0BSD"
 homepage="https://github.com/tavianator/bfs"
 changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md"
 distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=be51966ca3bcc0167fb16c89f81fa37ee13c6326c616c31b87fd564a54bdc5f2
+checksum=09cff2033544cbaa31af2ad7d59347056a53c04ff7c469bb5904e575d3641053
 
 post_install() {
 	vlicense LICENSE

From cce8c15318b5f46c11e7012b7457736da83d534d 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, 3 Apr 2021 22:14:43 +0700
Subject: [PATCH 0385/2024] firefox: mark broken for i686 temporary

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

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 58cc021a39d2..a8ba08719eb4 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -46,6 +46,10 @@ if [ "$XBPS_WORDSIZE" = "32" ]; then
 	nodebug=yes
 fi
 
+if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+	broken="out of memory allocating 65536 bytes after a total of 1181696000 bytes"
+fi
+
 # we need this because cargo verifies checksums of all files in vendor
 # crates when it builds and gives us no way to override or update the
 # file sanely... so just clear out the file list

From fa6a2bf57fa477ec6ca3cfaa00f85d7e8371b3ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 3 Apr 2021 16:11:55 +0200
Subject: [PATCH 0386/2024] bpftrace: update to 0.12.0.

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

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 0d6a2a2c14b0..f8357249eec3 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,6 +1,6 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
-version=0.11.4
+version=0.12.0
 revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=5b9c7509887e4337841e3188eabcc7247bc2c1cc312c983cbb8b77e341d20242
+checksum=8752c9eac8d9ab16d2227bb68f1d723ec83310895ab6f503ab6cfcf8b193acc0
 
 post_install() {
 	# clashes with bcc-tools

From e9e1fc30bdd9011842b22867daa68c30b3a32932 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 3 Apr 2021 18:45:13 +0200
Subject: [PATCH 0387/2024] erlang: update to 23.3.1.

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f02e96d48bc8..549c0df7bd5b 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.3
+version=23.3.1
 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=a9dfe9ea762b9f06f67af6074bed0f75705e1f114b9c45634db7d7cac2a293da
+checksum=a5a067a3b17bbef8511f2c056957925b666670b6f2cdaf645e1bc28ce3dd3517
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 31132784ff70742f5082e0c270fcc1b6835c8fd5 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 3 Apr 2021 11:33:00 +0200
Subject: [PATCH 0388/2024] lutris: update to 0.5.8.3.

---
 srcpkgs/lutris/patches/fix-dxvk.patch | 22 ----------------------
 srcpkgs/lutris/template               |  6 +++---
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/lutris/patches/fix-dxvk.patch

diff --git a/srcpkgs/lutris/patches/fix-dxvk.patch b/srcpkgs/lutris/patches/fix-dxvk.patch
deleted file mode 100644
index 1a7c135d06ed..000000000000
--- a/srcpkgs/lutris/patches/fix-dxvk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-upstream: yes
---- lutris/util/wine/dxvk.py
-+++ lutris/util/wine/dxvk.py
-@@ -53,7 +53,8 @@ def version(self):
-         """Return version of DXVK (latest known version if not provided)"""
-         if self._version:
-             return self._version
--        return self.versions[0]
-+        if self.versions:
-+            return self.versions[0]
- 
-     @property
-     def dxvk_path(self):
-@@ -62,6 +62,8 @@ def dxvk_path(self):
- 
-     def load_dxvk_versions(self):
-         versions_path = os.path.join(self.base_dir, "dxvk_versions.json")
-+        if not system.path_exists(versions_path):
-+            return []
-         with open(versions_path, "r") as dxvk_version_file:
-             dxvk_versions = [v["tag_name"] for v in json.load(dxvk_version_file)]
-         return dxvk_versions
diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index c8008f65f8fc..eaf360cbc3c2 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,7 +1,7 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.8.2
-revision=3
+version=0.5.8.3
+revision=1
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
 depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://lutris.net"
 changelog="https://raw.githubusercontent.com/lutris/lutris/master/debian/changelog"
 distfiles="https://github.com/lutris/lutris/archive/v${version}.tar.gz"
-checksum=6c2ac4810764fbae9fc6b4e68fb76c47371046ac4e5bdf9e7fcd9777d1b9d8c7
+checksum=2459db033c8648598c1a19718807b4978a165ff11b40050162ed005b44a52cd3

From 3fe4540fc32e3a2a3bf70a9407351fe482367637 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Sat, 3 Apr 2021 10:32:27 -0400
Subject: [PATCH 0389/2024] chezmoi: update to 2.0.7.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3e16e9951cf7..bebfed8d5b91 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.0.5
+version=2.0.7
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi"
@@ -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=36f52b8a519f43a64a3317920259eb43b183ad103302c6a3c8056ee3416fd4b4
+checksum=2c4000af2580009abc0057a2a4c6288ea1b61ff16917d6de6640c3bebb47378b
 
 post_install() {
 	vlicense LICENSE

From 363b7acc585b286a9b453806a4b87e20cb2a62ef Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 09:41:59 -0700
Subject: [PATCH 0390/2024] OpenCPN: fix license

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

diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template
index 7ba81e8fb966..ee67dbaff01c 100644
--- a/srcpkgs/OpenCPN/template
+++ b/srcpkgs/OpenCPN/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenCPN'
 pkgname=OpenCPN
 version=5.2.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON
@@ -16,7 +16,7 @@ depends="gpsd hicolor-icon-theme OpenCPN-tcdata-${version}_${revision}
  OpenCPN-gshhs-crude"
 short_desc="Concise ChartPlotter/Navigator"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, wxWidgets, JasPer-2.0, BSD-3-Clause, SGI-B-2.0"
+license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, WxWindows-exception-3.1, JasPer-2.0, BSD-3-Clause, SGI-B-2.0"
 homepage="https://opencpn.org/"
 distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz"
 checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7

From fc72140229fc341b1eecbfda5d04a6e682464411 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 3 Apr 2021 06:29:13 -0700
Subject: [PATCH 0391/2024] qimgv: Add support for additional image formats

Closes: #29975 [via git-merge-pr]
---
 srcpkgs/qimgv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qimgv/template b/srcpkgs/qimgv/template
index 7c5d5d18b8df..e206fe931d74 100644
--- a/srcpkgs/qimgv/template
+++ b/srcpkgs/qimgv/template
@@ -1,14 +1,14 @@
 # Template file for 'qimgv'
 pkgname=qimgv
 version=0.9.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_if video -DVIDEO_SUPPORT=ON -DVIDEO_SUPPORT=OFF)
  $(vopt_if scale -DOPENCV_SUPPORT=ON -DOPENCV_SUPPORT=OFF)"
 hostmakedepends="pkg-config"
 makedepends="exiv2-devel qt5-devel $(vopt_if video mpv-devel)
  $(vopt_if scale libopencv4-devel)"
-depends="hicolor-icon-theme"
+depends="hicolor-icon-theme qt5-imageformats"
 short_desc="Cross-platform image viewer with webm support"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"

From 7b171e8f64f0b203848b51cf6857e7eeadc023fa Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 00:12:33 -0700
Subject: [PATCH 0392/2024] Lucene++: fix license, short_desc

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

diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index d677c1c6c1c5..3873189f2dfc 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,14 +1,14 @@
 # Template file for 'Lucene++'
 pkgname=Lucene++
 version=3.0.7
-revision=10
+revision=11
 wrksrc=LucenePlusPlus-rel_$version
 build_style=cmake
 configure_args="-Wno-dev"
 makedepends="boost-devel gtest-devel"
-short_desc="A C++ port of the popular text search engine"
+short_desc="C++ port of the popular text search engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://github.com/luceneplusplus/LucenePlusPlus"
 distfiles="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${version}.tar.gz"
 checksum=6c19f203311e4b44a0ccf7b1127db77436eb47159ea1c54f7531a0b1ca585e0c

From 31d5d597b910bdf9e4c2e16b89d847515b91d6d6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 3 Apr 2021 09:11:53 +0300
Subject: [PATCH 0393/2024] lcms2: update to 2.12.

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

diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 766613fbc645..31cb74664549 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,15 +1,15 @@
 # Template file for 'lcms2'
 pkgname=lcms2
-version=2.11
+version=2.12
 revision=1
 build_style=gnu-configure
 makedepends="tiff-devel"
 short_desc="Small-footprint color management engine, version 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://littlecms.com"
 distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-${version}.tar.gz"
-checksum=dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e
+checksum=18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5
 
 post_install() {
 	vlicense COPYING

From 128de32cbd57993b315d4623947a202a40c01c0b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 12:41:11 +0300
Subject: [PATCH 0394/2024] sakura: update to 3.8.0.

Also enable localization.

Closes: #29924 [via git-merge-pr]
---
 srcpkgs/sakura/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template
index 378c3e43b5b8..096bc37d9bc7 100644
--- a/srcpkgs/sakura/template
+++ b/srcpkgs/sakura/template
@@ -1,9 +1,9 @@
 # Template file for 'sakura'
 pkgname=sakura
-version=3.7.1
+version=3.8.0
 revision=1
 build_style=cmake
-hostmakedepends="perl pkg-config"
+hostmakedepends="perl pkg-config gettext"
 makedepends="vte3-devel"
 depends="desktop-file-utils"
 short_desc="Simple but powerful libvte based terminal emulator"
@@ -11,5 +11,5 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://launchpad.net/sakura"
 distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2"
-checksum=729a4e0e750a4294bd9059243aac54df2a801250159fc550b50b0fe026ab928b
+checksum=0c414b368cb8f4263d3a899cd2b96e8caf839d916f3ee806e9f50d098fc2fa0f
 patch_args="-Np1"

From c2976976fd69c971836261ba35e7d8d8e5a5d8e2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 3 Apr 2021 21:38:02 +0200
Subject: [PATCH 0395/2024] libmanette: update to 0.2.5

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

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

From b4a1981232985e6f80a0d57a9694c96d374e99cd Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 3 Apr 2021 17:41:47 +0200
Subject: [PATCH 0396/2024] plasma-workspace: make sure that m_twinSpacer is
 initialized

this prevents a crash of panelspacers on musl (and maybe also 32bit
glibc)
---
 srcpkgs/plasma-workspace/patches/panelspacer-musl.patch | 9 +++++++++
 srcpkgs/plasma-workspace/template                       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/plasma-workspace/patches/panelspacer-musl.patch

diff --git a/srcpkgs/plasma-workspace/patches/panelspacer-musl.patch b/srcpkgs/plasma-workspace/patches/panelspacer-musl.patch
new file mode 100644
index 000000000000..184c349ce628
--- /dev/null
+++ b/srcpkgs/plasma-workspace/patches/panelspacer-musl.patch
@@ -0,0 +1,9 @@
+--- applets/panelspacer/plugin/panelspacer.h	2021-03-16 13:40:14.000000000 +0100
++++ -	2021-04-03 21:55:05.981463376 +0200
+@@ -73,5 +73,5 @@
+     void twinSpacerChanged();
+ 
+ private:
+-    PlasmaQuick::AppletQuickItem *m_twinSpacer;
++    PlasmaQuick::AppletQuickItem *m_twinSpacer = nullptr;
+ };
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 15366088e54a..015319ed3d03 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.21.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons

From a12c3e6d0505cc649007efb0b638cb639ed3b4c6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 3 Apr 2021 21:32:49 +0200
Subject: [PATCH 0397/2024] webkit2gtk: update to 2.32.0

---
 .../webkit2gtk/patches/be-typedarray.patch    | 22 +++++-----
 .../webkit2gtk/patches/bwrap-libdir32.patch   |  2 +-
 .../webkit2gtk/patches/fix-eglmesaext_h.patch |  2 +-
 .../patches/fix-musl-javascriptcore.patch     | 16 +++++---
 srcpkgs/webkit2gtk/patches/fix_armv6l.patch   |  2 +-
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    | 40 -------------------
 srcpkgs/webkit2gtk/patches/x86-no-sse2.patch  |  2 +-
 srcpkgs/webkit2gtk/template                   |  6 +--
 8 files changed, 29 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 347728bbb92e..d7cb99473c2e 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -5,7 +5,7 @@ https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to
 Updated by @q66.
 
 diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index f08f852..53e2813 100644
+index dbe211d..4da5fbd 100644
 --- Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
 +++ Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
 @@ -28,6 +28,7 @@
@@ -16,7 +16,7 @@ index f08f852..53e2813 100644
  
  namespace JSC {
  
-@@ -147,7 +148,18 @@ public:
+@@ -146,7 +147,18 @@ public:
      
      JSValue getIndexQuickly(unsigned i) const
      {
@@ -24,18 +24,18 @@ index f08f852..53e2813 100644
 +        switch (Adaptor::typeValue) {
 +        case TypeFloat32:
 +        case TypeFloat64:
-+            return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
++            return Adaptor::toJSValue(nullptr, getIndexQuicklyAsNativeValue(i));
 +        default:
 +            // typed array views are commonly expected to be little endian views of the underlying data
-+            return Adaptor::toJSValue(flipBytes(getIndexQuicklyAsNativeValue(i)));
++            return Adaptor::toJSValue(nullptr, flipBytes(getIndexQuicklyAsNativeValue(i)));
 +        }
 +#else
-         return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
+         return Adaptor::toJSValue(nullptr, getIndexQuicklyAsNativeValue(i));
 +#endif
      }
      
      void setIndexQuicklyToNativeValue(unsigned i, typename Adaptor::Type value)
-@@ -164,7 +176,20 @@ public:
+@@ -158,7 +170,20 @@ public:
      void setIndexQuickly(unsigned i, JSValue value)
      {
          ASSERT(!value.isObject());
@@ -56,8 +56,8 @@ index f08f852..53e2813 100644
      }
      
      bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -183,13 +208,54 @@ public:
-         if (i >= m_length)
+@@ -172,13 +197,54 @@ public:
+         if (isDetached() || i >= m_length)
              return false;
  
 +#if CPU(BIG_ENDIAN)
@@ -114,12 +114,12 @@ index f08f852..53e2813 100644
      void sort()
      {
 diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 5bca5d7..8a7111c 100644
+index 126f33c..0913af5 100644
 --- Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
 +++ Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -209,9 +209,36 @@ EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
+@@ -208,9 +208,36 @@ ALWAYS_INLINE EncodedJSValue genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
      scope.assertNoException();
-     RELEASE_ASSERT(!thisObject->isNeutered());
+     RELEASE_ASSERT(!thisObject->isDetached());
  
 -    if (std::isnan(static_cast<double>(*targetOption))) {
 +    double targetOptionLittleEndianAsDouble;
diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
index c136a64d9392..7b399660fab8 100644
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -4,7 +4,7 @@ diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Sour
 index 69b4dc6a6a0b..dc660f399257 100644
 --- Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
 +++ Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-@@ -758,9 +758,15 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
+@@ -759,9 +759,15 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
          "--ro-bind-try", "/usr/lib", "/usr/lib",
          "--ro-bind-try", "/usr/local/lib", "/usr/local/lib",
          "--ro-bind-try", LIBDIR, LIBDIR,
diff --git a/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch b/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
index 294c73ba24d7..7ab9e26d2088 100644
--- a/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
+++ b/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
@@ -1,6 +1,6 @@
 --- Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-09-23 10:17:18.000000000 +0200
 +++ Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-12-16 11:30:00.971252320 +0100
-@@ -31,6 +31,7 @@
+@@ -32,6 +32,7 @@
  #include "WebKitWaylandServerProtocol.h"
  #include <EGL/egl.h>
  #include <EGL/eglext.h>
diff --git a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
index a88b61fbc831..16b4189c96c0 100644
--- a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
+++ b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
@@ -4,6 +4,8 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
 
 Updated for latest webkit2gtk.
 
+-diff --git Source/JavaScriptCore/runtime/MachineContext.h Source/JavaScriptCore/runtime/MachineContext.h
+index ead9cdf..09dc28a 100644
 --- Source/JavaScriptCore/runtime/MachineContext.h
 +++ Source/JavaScriptCore/runtime/MachineContext.h
 @@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
@@ -51,11 +53,13 @@ Updated for latest webkit2gtk.
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
+diff --git Source/JavaScriptCore/runtime/OptionsList.h Source/JavaScriptCore/runtime/OptionsList.h
+index bc1cedb..f161f1c 100644
 --- Source/JavaScriptCore/runtime/OptionsList.h
 +++ Source/JavaScriptCore/runtime/OptionsList.h
-@@ -43,6 +43,16 @@ constexpr bool enableWebAssemblyStreamingApi = true;
- constexpr bool enableWebAssemblyStreamingApi = false;
- #endif
+@@ -39,6 +39,16 @@ namespace JSC {
+ 
+ JS_EXPORT_PRIVATE bool canUseJITCage();
  
 +#if defined(__GLIBC__)
 +constexpr unsigned jscMaxPerThreadStack = 5 * MB;
@@ -70,7 +74,7 @@ Updated for latest webkit2gtk.
  // How do JSC VM options work?
  // ===========================
  // The FOR_EACH_JSC_OPTION() macro below defines a list of all JSC options in use,
-@@ -90,9 +100,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+@@ -86,9 +96,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
      \
      v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
      \
@@ -81,8 +85,10 @@ Updated for latest webkit2gtk.
 +    v(Unsigned, softReservedZoneSize, jscSoftReservedZoneSize, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
 +    v(Unsigned, reservedZoneSize, jscReservedZoneSize, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
      \
+     v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \
      v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
-     v(Unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
+diff --git Source/WebCore/xml/XPathGrammar.cpp Source/WebCore/xml/XPathGrammar.cpp
+index 0875a5e..98d5153 100644
 --- Source/WebCore/xml/XPathGrammar.cpp
 +++ Source/WebCore/xml/XPathGrammar.cpp
 @@ -966,7 +966,7 @@ int yydebug;
diff --git a/srcpkgs/webkit2gtk/patches/fix_armv6l.patch b/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
index 284929f035d3..dc9c0776c39d 100644
--- a/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
+++ b/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
@@ -4,7 +4,7 @@ and https://bugs.webkit.org/show_bug.cgi?id=141288
 
 --- Source/JavaScriptCore/offlineasm/arm.rb	2015-07-22 14:37:57.000000000 +0200
 +++ Source/JavaScriptCore/offlineasm/arm.rb	2015-08-08 00:31:21.011824644 +0200
-@@ -473,8 +473,16 @@
+@@ -546,8 +546,16 @@
                  $asm.puts "mov #{armFlippedOperands(operands)}"
              end
          when "mvlbl"
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
deleted file mode 100644
index 80448614717a..000000000000
--- a/srcpkgs/webkit2gtk/patches/ppc-llint.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=221710
-
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 66571beb5c60..e273c6dd28a8 100644
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1579,13 +1579,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
-     loadp StructureChain::m_vector[t3], t3
-     assert(macro (ok) btpnz t3, ok end)
- 
--    loadp Structure::m_prototype[t2], t2
-+    loadp Structure::m_prototype + PayloadOffset[t2], t2
-     btpz t2, .opPutByIdTransitionChainDone
- .opPutByIdTransitionChainLoop:
-     loadp [t3], t1
-     bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
-     addp 4, t3
--    loadp Structure::m_prototype[t1], t2
-+    loadp Structure::m_prototype + PayloadOffset[t1], t2
-     btpnz t2, .opPutByIdTransitionChainLoop
- 
- .opPutByIdTransitionChainDone:
-@@ -2251,7 +2251,7 @@ end)
- 
- 
- op(llint_throw_from_slow_path_trampoline, macro()
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
- 
-@@ -2260,7 +2260,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
-     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
-     # the throw target is not necessarily interpreted code, we come to here.
-     # This essentially emulates the JIT's throwing protocol.
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     jmp VM::targetMachinePCForThrow[t1]
- end)
diff --git a/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch b/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
index c6c4c803bcfa..2b085c3a2294 100644
--- a/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
+++ b/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
@@ -1,7 +1,7 @@
  Source: Debian
 --- Source/cmake/WebKitCompilerFlags.cmake.orig	2020-12-15 15:29:50.240722972 +0700
 +++ Source/cmake/WebKitCompilerFlags.cmake	2020-12-15 15:29:59.659853014 +0700
-@@ -138,15 +138,6 @@
+@@ -141,15 +141,6 @@
      if (CMAKE_COMPILER_IS_GNUCXX)
          WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
      endif ()
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 60ab9db8861f..54cbb79f455d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.30.6
+version=2.32.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -35,14 +35,14 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
- qt5-devel $(vopt_if x11 libXt-devel)
+ qt5-devel libmanette-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>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e
+checksum=9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"

From 08765e13ce48cca34ccf32d3f2d0a46199249a71 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 3 Apr 2021 00:21:55 +0200
Subject: [PATCH 0398/2024] python3-aiorpcx: update to 0.18.7.

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

diff --git a/srcpkgs/python3-aiorpcx/template b/srcpkgs/python3-aiorpcx/template
index 4d44cf495c26..c8b4b39d53a7 100644
--- a/srcpkgs/python3-aiorpcx/template
+++ b/srcpkgs/python3-aiorpcx/template
@@ -1,20 +1,20 @@
 # Template file for 'python3-aiorpcx'
 pkgname=python3-aiorpcx
-version=0.18.4
-revision=2
+version=0.18.7
+revision=1
 wrksrc="aiorpcX-${version}"
 build_style=python3-module
-pycompile_module="aiorpcx"
 hostmakedepends="python3-setuptools"
 depends="python3-attrs"
-checkdepends="${depends} python3-pytest"
+checkdepends="${depends} python3-pytest python3-pytest-asyncio python3-uvloop
+ python3-websockets iana-etc"
 short_desc="Generic async RPC implementation"
 maintainer="Christian Buschau <christian.buschau@mailbox.org>"
 license="MIT"
 homepage="https://github.com/kyuupichan/aiorpcX"
 # missing license in PyPI tarball
 distfiles="https://github.com/kyuupichan/aiorpcX/archive/${version}.tar.gz"
-checksum=cfce9d4a6af83d6be8619b2268e57bb21db0a0b36ac29226db580b448c286498
+checksum=ce98d20a22535651c1479dd66a0e68674e1677632cb43e9706908a4c1e04deb9
 
 do_check() {
 	python3 -m pytest

From 8740b61c8d0ce98aafd3c9b62390fc45113d2c13 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 3 Apr 2021 00:22:08 +0200
Subject: [PATCH 0399/2024] electrum: update to 4.1.1.

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

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index c8f9aa4c6cff..5a7f44bcd334 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.0.9
+version=4.1.1
 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=67e63afe6a9d8944f872500fbf6312a3840f3fa8ebd0c1aadfbba3147d8b3c24
+checksum=359e14d91cdbeff4dd3c1c9973831c2d9dc3b95a84e795314705a73d72ecfbc8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \

From 64e19514617b7a936a89f1e95412e77d6603c9c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 3 Apr 2021 18:27:38 -0400
Subject: [PATCH 0400/2024] python3: update to 3.9.3.

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

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 9fa79661ba83..a80fa7f6481d 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,8 +3,8 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.9.2
-revision=2
+version=3.9.3
+revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
@@ -17,7 +17,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d
+checksum=30811039c65e04c14fc698e423947e464f9316e69fb44610bd38446046bb82b5
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From 665797e119eb82e0d50692bbb7a092181924179f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 3 Apr 2021 18:30:03 -0400
Subject: [PATCH 0401/2024] python3-tkinter: update to 3.9.3.

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

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 626392bc88fd..d499752ff0a1 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.9.2
+version=3.9.3
 revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="
@@ -23,7 +23,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d
+checksum=30811039c65e04c14fc698e423947e464f9316e69fb44610bd38446046bb82b5
 
 pre_configure() {
 	# Ensure that internal copies of expat and libffi are not used.

From 5e0752c4ac79207e8b7b888a4dd35f9671bc6eff Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sat, 3 Apr 2021 21:57:16 +0200
Subject: [PATCH 0402/2024] vips: update to 8.10.6.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index c0edf21dcdba..ccb0b01441ba 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.10.5
+version=8.10.6
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -33,7 +33,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=a4eef2f5334ab6dbf133cd3c6d6394d5bdb3e76d5ea4d578b02e1bc3d9e1cfd8
+checksum=2468088d958e0e2de1be2991ff8940bf45664a826c0dad12342e1804e2805a6e
 python_version=3
 
 build_options="gir hdf5"

From 66471a2308e08369952db733e64a8bc512439a44 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 4 Apr 2021 03:04:14 +0200
Subject: [PATCH 0403/2024] webkit2gtk: also set ndebug for none configuration

---
 srcpkgs/webkit2gtk/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 54cbb79f455d..8dd10c32be9a 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -10,9 +10,11 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
  -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
  -DCMAKE_CXX_FLAGS_DEBUG=-DNDEBUG
  -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_NONE=-DNDEBUG
  -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG
  -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG
  -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_C_FLAGS_NONE=-DNDEBUG
  -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
  -DRUBY_VERSION=2.7
  -DUSE_SYSTEMD=OFF

From 141121cabb9cc05506dbd22761b28f3900786136 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, 4 Apr 2021 07:26:20 +0700
Subject: [PATCH 0404/2024] Revert "cmake-bootstrap: update to 3.20.0."

This reverts commit 2709e170ae89fbf6f57574e2bdb96f49ec3dbf7c.

See: https://gitlab.kitware.com/cmake/cmake/-/issues/22024
---
 srcpkgs/cmake-bootstrap/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index f9c6548ef0ad..8b1c0b5aded8 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,7 +1,8 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-version=3.20.0
-revision=1
+reverts="3.20.0_1"
+version=3.19.7
+revision=2
 wrksrc=cmake-$version
 bootstrap=yes
 build_style=configure
@@ -16,7 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
+checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -36,6 +37,7 @@ post_patch() {
 	rm -rf Utilities/cmexpat
 	rm -rf Utilities/cmlibarchive
 	rm -rf Utilities/cmliblzma
+	rm -rf Utilities/cmlibrhash
 	rm -rf Utilities/cmnghttp2
 	rm -rf Utilities/cmzlib
 	rm -rf Utilities/cmzstd

From ef3e5729133f94ace4f2a2e71955404398655e0a 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, 3 Apr 2021 22:55:05 +0700
Subject: [PATCH 0405/2024] Revert "cmake: update to 3.20.0."

This reverts commit 392c1eec4d0163186cfaa8b17b338fa417df894a.

See: https://gitlab.kitware.com/cmake/cmake/-/issues/22024
---
 ...onfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch | 13 -------------
 srcpkgs/cmake/template                              |  7 ++++---
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch

diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
deleted file mode 100644
index d0a2860cc86e..000000000000
--- a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..84ef26b0fd 100644
---- Tests/ConfigSources/CMakeLists.txt
-+++ Tests/ConfigSources/CMakeLists.txt
-@@ -75,7 +75,7 @@ add_custom_command(APPEND
-   )
- 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 None Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
- endforeach()
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 93dbc971646c..b3d3d4c5159d 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,8 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.20.0
-revision=1
+reverts="3.20.0_1"
+version=3.19.7
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
  -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
@@ -16,7 +17,7 @@ maintainer="Nathan Owens <ndowens04@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=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
+checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
 
 export CMAKE_GENERATOR="Unix Makefiles"
 

From 9c64d8725eeb90de0eb14a10f772882f14c1a851 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, 4 Apr 2021 07:27:15 +0700
Subject: [PATCH 0406/2024] Revert "cmake-gui: update to 3.20.0."

This reverts commit f8ba38f3b912d1f71a6a4b50eec8f6c995946d51.

See: https://gitlab.kitware.com/cmake/cmake/-/issues/22024
---
 srcpkgs/cmake-gui/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 461463b3bc30..19b2def02d63 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,7 +1,8 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.0
-revision=1
+reverts="3.20.0_1"
+version=3.19.7
+revision=2
 wrksrc="cmake-${version}"
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -17,7 +18,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
+checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
 
 # XXX: cmake is broken if cmake was built with -GNinja
 # https://bugs.gentoo.org/596460

From e095b7c49c1373626809bbecb4d89eda4e3bfaab 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, 4 Apr 2021 07:23:41 +0700
Subject: [PATCH 0407/2024] zynaddsubfx: don't overwrite CMAKE_BUILD_TYPE

---
 .../patches/cmake-build-type-none.patch       | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch b/srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..64e6f1d19d94
--- /dev/null
+++ b/srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch
@@ -0,0 +1,47 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -185,7 +185,6 @@ option (BuildForDebug "Include gdb debug
+ option (IncludeWhatYouUse "Check for useless includes" OFF)
+ mark_as_advanced(IncludeWhatYouUse)
+ 
+-set(CMAKE_BUILD_TYPE "Release")
+ 
+ 
+ set (BuildOptions_x86_64AMD
+@@ -321,34 +320,6 @@ if(NOT AVOID_ASM)
+     add_definitions(-DASM_F2I_YES)
+ endif()
+ 
+-if (BuildForDebug)
+-	set (CMAKE_BUILD_TYPE "Debug")
+-	set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
+-	message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_DEBUG}")
+-else (BuildForDebug)
+-	set (CMAKE_BUILD_TYPE "Release")
+-	
+-	set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
+-	
+-	if (BuildForAMD_X86_64)
+-		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_x86_64AMD}")
+-	endif (BuildForAMD_X86_64)
+-	
+-	if (BuildForCore2_X86_64)
+-			set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_X86_64Core2}")
+-	endif (BuildForCore2_X86_64)
+-				
+-	if (SUPPORT_SSE)
+-		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_SSE}")
+-	endif (SUPPORT_SSE)
+-	
+-    if (SUPPORT_NEON AND NOT NoNeonPlease)
+-		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_NEON}")
+-	endif (SUPPORT_NEON AND NOT NoNeonPlease)
+-	
+-	message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_RELEASE}")
+-endif (BuildForDebug)
+-
+ if(NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
+     add_definitions(-fPIC)
+ endif()

From 2035293dd29e7ad8a67923b5bcaa89d5c6366c45 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, 20 Mar 2021 10:39:23 +0700
Subject: [PATCH 0408/2024] vtk: devendor most of dependencies

---
 common/shlibs                                 |  7 -------
 ...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 +++++++++++++++++++
 srcpkgs/vtk/template                          | 16 +++++++++++-----
 3 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..9aa0a601250b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3221,7 +3221,6 @@ libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
 libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
 libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
 libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistryOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
 libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
 libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
@@ -3253,7 +3252,6 @@ libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
 libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
 libvtkIOExport-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
 libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
 libvtkIOImage-9.0.so.1 vtk-9.0.1_1
@@ -3263,7 +3261,6 @@ libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
 libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
 libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
 libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMPIParallel-9.0.so.1 vtk-9.0.1_1
 libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
 libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
 libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
@@ -3293,10 +3290,8 @@ libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
 libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
 libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
 libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkParallelMPI-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContextOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
@@ -3314,10 +3309,8 @@ libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
 libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
 libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
 libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtkgl2ps-9.0.so.1 vtk-9.0.1_1
 libvtklibharu-9.0.so.1 vtk-9.0.1_1
 libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtkpugixml-9.0.so.1 vtk-9.0.1_1
 libvtksys-9.0.so.1 vtk-9.0.1_1
 libvtkverdict-9.0.so.1 vtk-9.0.1_1
 libvolume_key.so.1 volume_key-0.3.9_1
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
new file mode 100644
index 000000000000..b95015c859cf
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
@@ -0,0 +1,19 @@
+ https://gitlab.kitware.com/vtk/vtk/-/issues/18033
+--- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
++++ VTK/ThirdParty/freetype/vtk_freetype.h.in
+@@ -20,6 +20,15 @@
+ 
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include <ft2build.h>
++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
++/* has been moved to <freetype/internal/compiler-macros.h> */
++# ifndef FT_CALLBACK_DEF
++#  ifdef __cplusplus
++#   define FT_CALLBACK_DEF( x )  extern "C"  x
++#  else
++#   define FT_CALLBACK_DEF( x )  static  x
++#  endif
++# endif /* FT_CALLBACK_DEF */
+ #else
+ # include <vtkfreetype/include/ft2build.h>
+ #endif
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 1b2051aba307..7ca38759c59f 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,24 +1,30 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=3
+revision=4
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
 configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
+ -DVTK_USE_EXTERNAL=ON
+ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
+# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
  libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
  libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
- eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel python3-devel"
+ eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel
+ gl2ps-devel proj-devel python3-devel"
 short_desc="System for 3D computer graphics, image processing, and visualization"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
 checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
-
+patch_args=-Np1
 nocross="hdf5 is nocross"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -42,12 +48,12 @@ post_install() {
 
 	# Mangle CPython extension names in CMake like xbps-src will do
 	vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
-		-i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-release.cmake"
+		-i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
 }
 
 vtk-devel_package() {
 	short_desc+=" - development files"
-	depends="vtk-python3>=${version}_${revision}"
+	depends="vtk-python3>=${version}_${revision} ${makedepends}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so

From 91967017b668c06bc22921fcf98396990a71a3ca 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, 25 Mar 2021 07:30:43 +0700
Subject: [PATCH 0409/2024] alure: enable all options, no dlopen

While we'at it, switch distfiles to DEBIAN
---
 srcpkgs/alure/patches/include-close.patch | 12 ++++++++++++
 srcpkgs/alure/template                    | 13 +++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/alure/patches/include-close.patch

diff --git a/srcpkgs/alure/patches/include-close.patch b/srcpkgs/alure/patches/include-close.patch
new file mode 100644
index 000000000000..b7fe5226b5cf
--- /dev/null
+++ b/srcpkgs/alure/patches/include-close.patch
@@ -0,0 +1,12 @@
+Index: alure-1.2/src/codec_fluidsynth.cpp
+===================================================================
+--- alure-1.2.orig/src/codec_fluidsynth.cpp
++++ alure-1.2/src/codec_fluidsynth.cpp
+@@ -30,6 +30,7 @@
+ #ifdef _WIN32
+ #include <io.h>
+ #endif
++#include <unistd.h>
+ 
+ #include <istream>
+ 
diff --git a/srcpkgs/alure/template b/srcpkgs/alure/template
index d6f6ae17607a..af57f0f163c4 100644
--- a/srcpkgs/alure/template
+++ b/srcpkgs/alure/template
@@ -1,15 +1,20 @@
 # Template file for 'alure'
 pkgname=alure
 version=1.2
-revision=1
+revision=2
 build_style=cmake
-makedepends="libopenal-devel"
+configure_args="-DMODPLUG=ON -DDYNLOAD=OFF"
+hostmakedepends="pkg-config"
+makedepends="libopenal-devel libsndfile-devel libvorbis-devel libflac-devel
+ mpg123-devel libmodplug-devel fluidsynth-devel"
 short_desc="Utility library to help manage common tasks with OpenAL applications"
 maintainer="Simon Whelan <si.whelan@gmail.com>"
 license="MIT"
-homepage="http://kcat.strangesoft.net/alure.html"
-distfiles="http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2"
+# homepage="http://kcat.strangesoft.net/alure.html"
+homepage="https://github.com/kcat/alure"
+distfiles="${DEBIAN_SITE}/main/a/alure/alure_${version}.orig.tar.bz2"
 checksum=465e6adae68927be3a023903764662d64404e40c4c152d160e3a8838b1d70f71
+patch_args=-Np1
 
 post_install() {
 	vlicense COPYING

From a542d29613312a53c0584ebe9e28efb87619b392 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, 27 Mar 2021 15:13:24 +0700
Subject: [PATCH 0410/2024] rmilter: de-vendor most of dependencies

While we're at it, set the group to _rmilter.
---
 srcpkgs/rmilter/patches/de-vendor.patch  | 58 ++++++++++++++++++++++++
 srcpkgs/rmilter/patches/fix-cflags.patch | 24 ++++++++++
 srcpkgs/rmilter/template                 | 14 ++++--
 3 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/rmilter/patches/de-vendor.patch
 create mode 100644 srcpkgs/rmilter/patches/fix-cflags.patch

diff --git a/srcpkgs/rmilter/patches/de-vendor.patch b/srcpkgs/rmilter/patches/de-vendor.patch
new file mode 100644
index 000000000000..078b15d4e661
--- /dev/null
+++ b/srcpkgs/rmilter/patches/de-vendor.patch
@@ -0,0 +1,58 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -240,10 +240,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}
+ 					"${CMAKE_BINARY_DIR}/src"
+ 					"${CMAKE_BINARY_DIR}/"
+ 					"${CMAKE_SOURCE_DIR}/compat"
+-					"${CMAKE_SOURCE_DIR}/uthash"
+-					"${CMAKE_SOURCE_DIR}/contrib/libucl"
+-					"${CMAKE_SOURCE_DIR}/contrib/http-parser"
+-					"${CMAKE_SOURCE_DIR}/contrib/xxhash")
++					)
+ 
+ BISON_TARGET(CfgParser src/cfg_file.y ${CMAKE_CURRENT_BINARY_DIR}/cfg_yacc.c)
+ FLEX_TARGET(CfgScanner src/cfg_file.l  ${CMAKE_CURRENT_BINARY_DIR}/cfg_lex.c)
+@@ -376,16 +373,17 @@ IF(ENABLE_MEMCACHED MATCHES "ON")
+ 		MODULES libmemcached)
+ ENDIF()
+ 
++pkg_check_modules(hiredis REQUIRED hiredis)
++pkg_check_modules(libucl REQUIRED libucl)
++pkg_check_modules(libzstd REQUIRED libzstd)
++
+ ################################ SOURCES SECTION ###########################
+-ADD_SUBDIRECTORY(hiredis)
+-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/hiredis")
++INCLUDE_DIRECTORIES(${hiredis_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${libucl_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${libzstd_INCLUDE_DIRS})
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/lc-btrie")
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/")
+-ADD_SUBDIRECTORY(contrib/libucl)
+-ADD_SUBDIRECTORY(contrib/http-parser)
+-ADD_SUBDIRECTORY(contrib/xxhash)
+ ADD_SUBDIRECTORY(contrib/lc-btrie)
+-ADD_SUBDIRECTORY(contrib/zstd)
+ 
+ SET(RMILTERSRC
+                 compat/blake2b-ref.c
+@@ -410,12 +408,12 @@ CONFIGURE_FILE(config.h.in config.h)
+ ADD_EXECUTABLE(rmilter ${RMILTERSRC})
+ SET_TARGET_PROPERTIES(rmilter PROPERTIES LINKER_LANGUAGE C)
+ TARGET_LINK_LIBRARIES(rmilter ${RMILTER_REQUIRED_LIBRARIES})
+-TARGET_LINK_LIBRARIES(rmilter rmilter-hiredis)
+-TARGET_LINK_LIBRARIES(rmilter ucl)
+-TARGET_LINK_LIBRARIES(rmilter xxhash)
+-TARGET_LINK_LIBRARIES(rmilter rmilter-http-parser)
++TARGET_LINK_LIBRARIES(rmilter ${hiredis_LINK_LIBRARIES})
++TARGET_LINK_LIBRARIES(rmilter ${libucl_LINK_LIBRARIES})
++TARGET_LINK_LIBRARIES(rmilter -lxxhash)
++TARGET_LINK_LIBRARIES(rmilter -lhttp_parser)
+ TARGET_LINK_LIBRARIES(rmilter lcbtrie)
+-TARGET_LINK_LIBRARIES(rmilter rmilter-zstd)
++TARGET_LINK_LIBRARIES(rmilter ${libzstd_LINK_LIBRARIES})
+ 
+ ##################### INSTALLATION ##########################################
+ 
diff --git a/srcpkgs/rmilter/patches/fix-cflags.patch b/srcpkgs/rmilter/patches/fix-cflags.patch
new file mode 100644
index 000000000000..7983764ecf94
--- /dev/null
+++ b/srcpkgs/rmilter/patches/fix-cflags.patch
@@ -0,0 +1,24 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -296,18 +296,7 @@ IF(SUPPORT_STD_FLAG)
+ ENDIF(SUPPORT_STD_FLAG)
+ 
+ # Optimization flags
+-IF(NOT CMAKE_C_OPT_FLAGS)
+-	IF(ENABLE_OPTIMIZATION MATCHES "ON")
+-		SET(CMAKE_C_OPT_FLAGS "-O3 -fstrict-aliasing")
+-	ELSE(ENABLE_OPTIMIZATION MATCHES "ON")
+-		SET(CMAKE_C_OPT_FLAGS "-g -O2 -fstrict-aliasing")
+-	ENDIF(ENABLE_OPTIMIZATION MATCHES "ON")
+-ENDIF(NOT CMAKE_C_OPT_FLAGS)
+-
+-IF(ENABLE_DEBUG MATCHES "ON")
+-	SET(CMAKE_BUILD_TYPE "Debug")
+-    SET(WITH_DEBUG 1)
+-ENDIF(ENABLE_DEBUG MATCHES "ON")
++SET(CMAKE_C_OPT_FLAGS "-fstrict-aliasing")
+ 
+ SET(CMAKE_C_FLAGS "${CMAKE_C_OPT_FLAGS} ${CMAKE_C_FLAGS} ${CMAKE_C_WARN_FLAGS}")
+ 
diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a131af6c7f07..0c2e00b5169d 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -3,21 +3,27 @@ pkgname=rmilter
 version=1.10.0
 revision=1
 build_style=cmake
-configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
+configure_args="-DMILTER_USER=rmilter -DMILTER_GROUP=_rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel
+ libsasl-devel libmemcached-devel glib-devel xxHash-devel libzstd-devel
+ http-parser-devel hiredis-devel libucl-devel uthash"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
-license="BSD"
+license="BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/vstakhov/rmilter"
 distfiles="$homepage/archive/${version}.tar.gz"
 checksum=ea80563fa7636afed0b5fd9a29aa2300f15793ed85788e4ce69c187d341a7d54
 system_accounts="rmilter"
+rmilter_pgroup="_rmilter"
 rmilter_homedir="/var/lib/rmilter"
 
 post_install() {
 	vdoc rmilter.conf.sample
 	vdoc rmilter-grey.conf
 	vsv rmilter
-	vlicense src/rmilter.c
+	head -26 src/rmilter.c >rmilter.LICENSE
+	head -38 contrib/lc-btrie/btrie.h >btrie.LICENSE
+	vlicense rmilter.LICENSE
+	vlicense btrie.LICENSE
 }

From 58f624c848070086d0d650e3abc447bff537639f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Apr 2021 16:38:59 +0200
Subject: [PATCH 0411/2024] ugrep: update to 3.1.11.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index ce874e4647e3..567a712401c4 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.10
+version=3.1.11
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -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=185984cf7f7e713feb91bcac396d0d16f1f21b6b60b37f1a2269e324af727130
+checksum=43542115612f066ae22610da1510356955b142135bb23e97ed4266be28ec3e13
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From d956506709ff589e6d5fc184d3129fcccd41ac72 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 14:39:00 +0300
Subject: [PATCH 0412/2024] font-manjari: update to 2.000.

Closes: #29928 [via git-merge-pr]
---
 srcpkgs/font-manjari/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/font-manjari/template b/srcpkgs/font-manjari/template
index 3303e7b2e0df..92524f3a82f6 100644
--- a/srcpkgs/font-manjari/template
+++ b/srcpkgs/font-manjari/template
@@ -1,6 +1,6 @@
 # Template file for 'font-manjari'
 pkgname=font-manjari
-version=1.920
+version=2.000
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -8,10 +8,8 @@ short_desc="Malayalam font with smooth curves"
 maintainer="Ashish Kurian Thomas <a@aktsbot.in>"
 license="OFL-1.1"
 homepage="https://smc.org.in/fonts/manjari"
-distfiles="https://releases.smc.org.in/fonts/manjari/Version${version}/manjari-Version${version}.tar.gz
- https://gitlab.com/smc/fonts/manjari/-/raw/Version${version}/LICENSE.txt"
-checksum="77cfe8fbb18ed5325e228d96b4b69cfd21cc9434eab18656fb9bc48ce691b9c3
- 3ff5ecb5ffbfe008bcc1e2861f2124aabd5571ad1ae9badc245a4e383727ccd2"
+distfiles="https://releases.smc.org.in/fonts/manjari/Version${version}/manjari-Version${version}.tar.gz"
+checksum=c7d99a8fc70137d99297ce20f9a20a58a159450fbf6b4722138f7698cb99a102
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
@@ -21,6 +19,4 @@ do_install() {
 
 	# install fontconfig file
 	vinstall 67-fonts-smc-manjari.conf 0644 etc/fonts/conf.avail/67-fonts-smc-manjari.conf
-
-	vlicense LICENSE.txt
 }

From 55b5bbad475cb3ee9491d6f24542c2aa46ba3c4b Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 29 Mar 2021 09:00:36 +0200
Subject: [PATCH 0413/2024] geonkick: update to 2.8.0.

---
 srcpkgs/geonkick/patches/musl.patch | 39 -----------------------------
 srcpkgs/geonkick/template           |  8 +++---
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/geonkick/patches/musl.patch

diff --git a/srcpkgs/geonkick/patches/musl.patch b/srcpkgs/geonkick/patches/musl.patch
deleted file mode 100644
index 281752a92ecb..000000000000
--- a/srcpkgs/geonkick/patches/musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git dsp/src/compressor.h dsp/src/compressor.h
-index 2b246be..e6cac5d 100644
---- dsp/src/compressor.h
-+++ dsp/src/compressor.h
-@@ -26,6 +26,8 @@
- 
- #include "geonkick_internal.h"
- 
-+#include <pthread.h>
-+
- struct gkick_compressor {
-         int enabled;
- 
-diff --git dsp/src/distortion.h dsp/src/distortion.h
-index 4e42f11..b06e6e5 100644
---- dsp/src/distortion.h
-+++ dsp/src/distortion.h
-@@ -26,6 +26,8 @@
- 
- #include "geonkick_internal.h"
- 
-+#include <pthread.h>
-+
- struct gkick_distortion {
-         int enabled;
- 	/* Input limiter for distortion. */
-diff --git dsp/src/synthesizer.h dsp/src/synthesizer.h
-index 303f810..d4d4f9b 100644
---- dsp/src/synthesizer.h
-+++ dsp/src/synthesizer.h
-@@ -31,6 +31,8 @@
- 
- #include <stdatomic.h>
- 
-+#include <pthread.h>
-+
- struct gkick_synth {
-       	atomic_size_t id;
-         char name[30];
diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template
index 3af40e196c69..e3acec2aa4a0 100644
--- a/srcpkgs/geonkick/template
+++ b/srcpkgs/geonkick/template
@@ -1,17 +1,17 @@
 # Template file for 'geonkick'
 pkgname=geonkick
-version=2.7.2
+version=2.8.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config tar xz redkite"
-makedepends="redkite-devel jack-devel libsndfile-devel rapidjson
+hostmakedepends="pkg-config tar xz"
+makedepends="jack-devel libsndfile-devel rapidjson
  lv2 libX11-devel cairo-devel"
 short_desc="Free software percussion synthesizer"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/iurie-sw/geonkick"
 distfiles="https://github.com/iurie-sw/geonkick/archive/v${version}.tar.gz"
-checksum=ee4afd97657620ffdcae34192c1d51953059b79d382bc4f165252085b6e24010
+checksum=ec656e76df13ae1226bba6eeb8146c4f0ddbae2c34d28a89db473c16497eaff4
 make_check=extended # No target to "ninja test".
 
 if [[ ! ${XBPS_TARGET_MACHINE} == "x86_64" ]]; then

From f4554135070cbd047a1d96ac706b3acd967a7c89 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 4 Apr 2021 20:23:53 +0200
Subject: [PATCH 0414/2024] redkite: remove package.

Closes: #29845 [via git-merge-pr]
---
 srcpkgs/redkite-devel             |  1 -
 srcpkgs/redkite/template          | 22 ----------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 120000 srcpkgs/redkite-devel
 delete mode 100644 srcpkgs/redkite/template

diff --git a/srcpkgs/redkite-devel b/srcpkgs/redkite-devel
deleted file mode 120000
index 98f68eebb4c0..000000000000
--- a/srcpkgs/redkite-devel
+++ /dev/null
@@ -1 +0,0 @@
-redkite
\ No newline at end of file
diff --git a/srcpkgs/redkite/template b/srcpkgs/redkite/template
deleted file mode 100644
index 994865d7668a..000000000000
--- a/srcpkgs/redkite/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'redkite'
-pkgname=redkite
-version=1.3.1
-revision=1
-build_style=cmake
-makedepends="cairo-devel libX11-devel"
-short_desc="GUI toolkit"
-maintainer="teldra <teldra@rotce.de>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/iurie-sw/redkite"
-distfiles="https://github.com/iurie-sw/redkite/archive/v${version}.tar.gz"
-checksum=18f2e3808201e350624279db6553baf53113a7351d80edc3604dccfc32a68e67
-make_check=extended # No target to "ninja test".
-
-redkite-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/include"
-		vmove "usr/lib"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..79e7c4d1c77e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -259,6 +259,7 @@ replaces="
  qt5dxcb-plugin<=5.0.11_1
  qt5integration<=5.0.0_7
  r2-bindings<=1.0.1_2
+ redkite<=1.3.1_1
  reminiscence<=0.4.6_1
  rkt<=1.30.0_3
  rkt-stage1-fly<=1.30.0_3

From deaf09744ae92d04b333d438b3bbc5322cc342bd Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 4 Apr 2021 20:36:01 +0200
Subject: [PATCH 0415/2024] py3status: update to 3.36.

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

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index dbc52049950e..d139f2cfe49e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.35
+version=3.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,8 +10,9 @@ short_desc="Alternative i3bar implementation in Python3"
 maintainer="teldra <teldra@rotce.de>"
 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=8069e35ff7dead4feecdd714b6c36985c4dbfd2cc133ff0ae6d190e99549f55b
+checksum=d5c26058217975014e0b5590b4a0df535b3e7969455bdf566d96d801ae46fbba
 
 do_check() {
 	python3 -m pytest

From 388db68520e0f6a27c8ffd7d82b3bcede21e9093 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 20:07:56 +0300
Subject: [PATCH 0416/2024] foliate: update to 2.6.3.

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

diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template
index ba9e6c7c956b..1893c8b2a677 100644
--- a/srcpkgs/foliate/template
+++ b/srcpkgs/foliate/template
@@ -1,6 +1,6 @@
 # Template file for 'foliate'
 pkgname=foliate
-version=2.6.2
+version=2.6.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext gjs glib-devel"
@@ -11,7 +11,7 @@ maintainer="lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://johnfactotum.github.io/foliate/"
 distfiles="https://github.com/johnfactotum/foliate/archive/${version}.tar.gz"
-checksum=974cac48d8ade2c623dfa5f45cfeafb99e646d7bf2df11a3928237c2829c1ac4
+checksum=de685facecb1d014c6041dbad75a5609948a0b18b97c74e31e3a1722bccafbe4
 python_version=3
 
 post_install() {

From 1ad7d217dae8d2c16747cb100b5cf0c9d0e43d91 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 19:49:46 +0300
Subject: [PATCH 0417/2024] icewm: update to 2.3.1.

---
 srcpkgs/icewm/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 1eaf2c37ce20..6b893aa533f8 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,8 +1,9 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.2.1
+version=2.3.1
 revision=1
 build_style=cmake
+make_cmd=make
 configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON
  -DCONFIG_XPM=ON -DCONFIG_LIBJPEG=ON -DCFGDIR=/etc/icewm"
 hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl
@@ -16,10 +17,13 @@ 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=199a37a395e8788b4c2eeb73c46248654d785b2862b89bb5b01709eb33968dc8
+checksum=b44136a519fc2c5b8077879d1d13f2375646ff1580f3db54dd418dfc3b98e5fe
 # broken tests
 make_check=no
 
+# Ninja build files generation fails
+export CMAKE_GENERATOR="Unix Makefiles"
+
 # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok
 CXXFLAGS="-Wno-odr -fno-strict-aliasing"
 

From e43a68d497106055afc04275d99647bdc49ff0f1 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 4 Apr 2021 19:44:46 +0200
Subject: [PATCH 0418/2024] perl-CryptX: update to 0.071

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

diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template
index ce6303e5b4d7..57e4a4306081 100644
--- a/srcpkgs/perl-CryptX/template
+++ b/srcpkgs/perl-CryptX/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-CryptX'
 pkgname=perl-CryptX
-version=0.070
+version=0.071
 revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later, Unlicense"
 homepage="https://metacpan.org/release/CryptX"
 distfiles="${CPAN_SITE}/Crypt/${pkgname#perl-}-${version}.tar.gz"
-checksum=1f3a22c9035b4aaf96bb931dd57d6e431990d29c5f55dde949a54b6e65e9450e
+checksum=7249132e3452fa326d02f242d714a3ede0cca021442bed4fae644d94b0b649be

From 4a590e456b04e8bdbf95327772c6a712fa0a1305 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 4 Apr 2021 19:23:20 +0200
Subject: [PATCH 0419/2024] praat: update to 6.1.41

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

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 6fed29714eab..fdd7e8cc3097 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.40
+version=6.1.41
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=86bdcbe7810080532ffe65c92d44028cedf54813ec2d31674a53b3e7ceb8e100
+checksum=886e835c733ba88eec408893169c797132ed670d8beae2d9c5c52bb8a2609b03
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From 241f2d1e86811622ce20169fd25a2460ccdb3272 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 4 Apr 2021 20:16:15 +0200
Subject: [PATCH 0420/2024] portage: update to 3.0.18.

Closes: #30000 [via git-merge-pr]
---
 srcpkgs/portage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 618be8d2781b..bee8c380162a 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.17
+version=3.0.18
 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=96cf79d8d28cf66214871ae9cacb8246d60b443a1eb42c7ae40876f43ae6803e
+checksum=78613290807e80d49ecb4c530639056eb32953f669d1600e7f0a6667871335e5
 
 conf_files="
 	/etc/dispatch-conf.conf

From 2c8f5e9a61625232c710bbf5f1bbc7101442dd71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 4 Apr 2021 16:02:57 +0200
Subject: [PATCH 0421/2024] exiftool: update to 12.23.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index d90e9d91c6af..8a29db2e1e34 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.22
+version=12.23
 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=8c913623b9007e9cf18f15a43d31a05459dbdb9aa5daaef8201eaec753fe5a6d
+checksum=825188ea0721b6db9c35a2fa4cd680342a129f6fa5bae41bb17da2d4299771d1

From c70235dbb248863b1e0b1186cc9aa4da5fabe9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sun, 4 Apr 2021 16:00:02 +0200
Subject: [PATCH 0422/2024] Clight: update to 4.5

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

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index be2ad8c973e7..cff8201154a1 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,6 +1,6 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.4
+version=4.5
 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=1371ac6f537cec4fc61581dbb6ceb143df08f20e24f884fa148068008864b054
+checksum=2ce204edd58284c178b99e2ffec0105fc8e78d8a076350f64424b66c9878e91e
 
 post_install() {
 	vcompletion Extra/completions/_clight zsh

From 78c6feff50f8afe21a1615520680bc7325aa4ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sun, 4 Apr 2021 16:07:50 +0200
Subject: [PATCH 0423/2024] Clightd: update to 5.3

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

diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index 5d63698607ec..e1ff136a3f43 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,7 +1,7 @@
 # Template file for 'Clightd'
 pkgname=Clightd
-version=5.2
-revision=2
+version=5.3
+revision=1
 build_style=cmake
 cmake_builddir=build
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"
@@ -15,7 +15,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clightd"
 distfiles="https://github.com/FedeDP/Clightd/archive/${version}.tar.gz"
-checksum=6636d58eae7aff4780534258940d1f680637fc1b983320e15aa2fd5be8648853
+checksum=05e109618cf2d4b31bc37780bbc60c58bc7064fe1d27e8d504d3fef318099a31
 
 post_install() {
 	vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/

From b6fd63dfc3988407f03567b37bc7d817c802dba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 4 Apr 2021 16:19:40 +0200
Subject: [PATCH 0424/2024] doomretro: update to 4.0.7.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 4728e9c04703..d1a30b8a050b 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0.6
+version=4.0.7
 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=68ecdfe52e76a3258f3144cf006edb91723c1033d958589f47341aff1895ecdb
+checksum=3914b63be559cf1fa2ddd852cadbfe619cd733ee9ef5e671806179c57fe84f8f

From 04ecb8456b01ec601d37034249514d5e11ae1600 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 15:40:06 +0300
Subject: [PATCH 0425/2024] wine-mono: update to 6.1.1.

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

diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index da8a3e647f7a..1bab384c2fad 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.0.0
+version=6.1.1
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0
+checksum=ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From f0e9876cac995ca5320b1112cfe2a9b697dcfd1c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 15:19:17 +0300
Subject: [PATCH 0426/2024] mousepad: update to 0.5.4, adopt.

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

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 7159c772fa11..ebf5fba1a24b 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,6 +1,6 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.3
+version=0.5.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -8,9 +8,9 @@ hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://git.xfce.org/apps/mousepad/tree/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=e7208bb9e96a1525d3358a64f9cdd165005078e84e81984a953a2a03491fcaa8
+checksum=d90f492e5d0cba5f5b3b0c1eb7fd7c1701aef57e3fa244d2c457e7f9b0a42aa1

From 67f99b95aa02c97ac2890aa0194af9e2592fc05a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 15:13:13 +0300
Subject: [PATCH 0427/2024] mtpaint: update to 3.50.09.

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

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index dd64ea47d727..6f0bef61139d 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50.08
+version=3.50.09
 revision=1
-_commit=4ea607e44f7fe9373d399f56d59e048d62034619
+_commit=199472ad6a4ecee6c8583fb5a504a2e99712b4fc
 wrksrc="mtPaint-${_commit}"
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://mtpaint.sourceforge.net/"
 changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
 distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=1d482e493b7ff27677168952192fc2663357fa408f1a98893c0c07d4a2604c06
+checksum=d4e00175ada01ec02135cc9c3d5235c5be6c24a957d694553d25e3370ec81035
 
 post_install() {
 	vdoc doc/vcode.t2t

From 3886ce2c1242e68f8c4b7cf6611563e04862c38f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 14:59:05 +0300
Subject: [PATCH 0428/2024] stremio-shell: update to 4.4.135.

---
 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 d641db31930c..15165e817d88 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.134
+version=4.4.135
 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="d332ce065f7c214e3bcbd556d41e265a4fe8e76dec4960051f17bd971de6da37
+checksum="f272b7d7f22f7d882f3c19035322d2efb702992d6add98cf8acb996a6a80f84d
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- afcef98cbbefcac0d7a9e30a7d1285be83262a83723e982b6116d8854d16a880
- 08cb738d9d1a4104a1181bf56ebcaf43008ac37cb8943c70736113c6fb6823df"
+ 1560580101ec49d577f1840bc4215a584d01ee04a254826194b87f727f73bdc5
+ 03173f78f1de32522c3cad4f3db3e315b7d4f409795e30347aa13c617321ce39"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {

From 5ab49010e71cf32ce3e331517adcd9a581418234 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 4 Apr 2021 19:26:31 +0200
Subject: [PATCH 0429/2024] build-style/void-cross.sh: fix leftover _triplet
 variable

---
 common/build-style/void-cross.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 00fa1985c947..d1e1ffef2d6d 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -607,7 +607,7 @@ do_install() {
 		${DESTDIR}/${sysroot}/usr/include/c++/${gcc_patch}
 
 	# Symlinks for gnarl and gnat shared libraries
-	local adalib=usr/lib/gcc/${_triplet}/${gcc_patch}/adalib
+	local adalib=usr/lib/gcc/${tgt}/${gcc_patch}/adalib
 	mv ${DESTDIR}/${adalib}/libgnarl-${gcc_major}.so \
 		${DESTDIR}/${sysroot}/usr/lib
 	mv ${DESTDIR}/${adalib}/libgnat-${gcc_major}.so \

From 36ce71692defbad3d25e0d09ee42f280c87977a4 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 3 Apr 2021 21:48:13 -0400
Subject: [PATCH 0430/2024] python3-trimesh: update to 3.9.10.

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

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index c9df7c5a1ae6..5bcb7ad98725 100644
--- a/srcpkgs/python3-trimesh/template
+++ b/srcpkgs/python3-trimesh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-trimesh'
 pkgname=python3-trimesh
-version=3.9.9
+version=3.9.10
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -17,7 +17,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://trimsh.org/"
 distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz"
-checksum=d18fb30884dd4380d31938e5992dc2a138c5e6072ede28e6889feb4e5adae588
+checksum=ca1aeb6fb5eb1e6bf4793fe7b9dbfaee30e7e1506f57ead6f0f1db156c64d735
 
 post_install() {
 	vlicense LICENSE.md

From 23d5aa43d73f95b3e05201a76584ed9b61ee738c Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 29 Mar 2021 17:00:04 -0400
Subject: [PATCH 0431/2024] python3-zeroconf: update to 0.29.0.

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

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index 61d6f48cedcf..46e78473d8ce 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,14 +1,19 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.28.8
+version=0.29.0
 revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ifaddr"
+checkdepends="python3-pytest python3-mypy $depends"
 short_desc="Pure Python3 implementation of multicast DNS service discovery"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/jstasiak/python-zeroconf"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=5272431bf88611c722119504504b86738f9366f518781deb24e520e382d1f337
+checksum=b8e7c55f36973362314b7d8cf716a76afea3c91abe9d2f435329dc67b973fe06
+
+do_check() {
+	python3 -m pytest zeroconf/test.py
+}

From 68687d03cf0e926870cdcddb83c2f263c369ae3b Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Tue, 30 Mar 2021 10:56:19 +0200
Subject: [PATCH 0432/2024] New package: python3-pdfminer.six-20201018

---
 .../python3-pdfminer.six/patches/dep.patch    | 26 +++++++++++++++++++
 srcpkgs/python3-pdfminer.six/template         | 19 ++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 srcpkgs/python3-pdfminer.six/patches/dep.patch
 create mode 100644 srcpkgs/python3-pdfminer.six/template

diff --git a/srcpkgs/python3-pdfminer.six/patches/dep.patch b/srcpkgs/python3-pdfminer.six/patches/dep.patch
new file mode 100644
index 000000000000..c5c7186184fb
--- /dev/null
+++ b/srcpkgs/python3-pdfminer.six/patches/dep.patch
@@ -0,0 +1,26 @@
+--- ./CHANGELOG.md
++++ ./CHANGELOG.md
+@@ -3,6 +3,11 @@ All notable changes in pdfminer.six will be documented in this file.
+ 
+ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+ 
++## [Unreleased]
++
++### Removed
++- Unused dependency on `sortedcontainers` package ([#525](https://github.com/pdfminer/pdfminer.six/pull/525))
++
+ ## [20201018]
+ 
+ ### Deprecated
+
+--- ./setup.py
++++ ./setup.py
+@@ -15,7 +15,6 @@
+     install_requires=[
+         'chardet ; python_version > "3.0"',
+         'cryptography',
+-        'sortedcontainers',
+     ],
+     extras_require={
+         "dev": ["nose", "tox"],
+
diff --git a/srcpkgs/python3-pdfminer.six/template b/srcpkgs/python3-pdfminer.six/template
new file mode 100644
index 000000000000..753dbfb9b816
--- /dev/null
+++ b/srcpkgs/python3-pdfminer.six/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pdfminer.six'
+pkgname=python3-pdfminer.six
+version=20201018
+revision=1
+wrksrc=pdfminer.six-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-cryptography python3-chardet"
+checkdepends="$depends tox python3-nose"
+short_desc="Tool for extracting information from PDF documents"
+maintainer="Bleznudd <bleznudd@pm.me>"
+license="MIT"
+homepage="https://github.com/pdfminer/pdfminer.six"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=0e9c8b0a9c40c2aee044c3091ad6b18b5e6279722e64b6b975f8aedc26bf8e38
+
+post_install() {
+	vlicense LICENSE
+}

From 38149399af3592731cdac6777337ca08ae1a95be Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Tue, 30 Mar 2021 10:56:26 +0200
Subject: [PATCH 0433/2024] setzer: update to 0.4.1.

Closes: #29873 [via git-merge-pr]
---
 srcpkgs/setzer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index df80eaee0111..4546753dbd66 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,14 +1,14 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.3.9
+version=0.4.1
 revision=1
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-PyPDF2"
+depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-pdfminer.six"
 short_desc="Simple yet full-featured LaTeX editor written in Python with Gtk"
 maintainer="Bleznudd <bleznudd@pm.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cvfosammmm/setzer"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=abddd4b85f41a84fc0ce18377cf955df8f9a10e0350133692e187f74f0828dad
+checksum=a76182c16a8dc699d6e36f0b330fa498a6b718fe44e0a0959db6ff05362c628f

From 687c6ed8e4b48ab62664aa286cb8f9e69505c7cc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 1 Apr 2021 10:25:33 -0700
Subject: [PATCH 0434/2024] CellWriter: fix license

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

diff --git a/srcpkgs/CellWriter/template b/srcpkgs/CellWriter/template
index 13f6816868f4..fbaefb338aca 100644
--- a/srcpkgs/CellWriter/template
+++ b/srcpkgs/CellWriter/template
@@ -1,14 +1,14 @@
 # Template file for 'CellWriter'
 pkgname=CellWriter
 version=1.3.6
-revision=1
+revision=2
 wrksrc=cellwriter-${version}
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel libXtst-devel"
 short_desc="Grid-entry natural handwriting input panel"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/risujin/cellwriter"
 distfiles="https://github.com/risujin/cellwriter/archive/${version}.tar.gz"
 checksum=17bb07226d4680b565b18a60494cb19cdf9067b427c8df7454c16d809de9963b

From 9bdd3e663ffd1ef1d2358109c0e20856a7c442ec Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 2 Apr 2021 23:41:45 -0700
Subject: [PATCH 0435/2024] GConf: fix license, verify python version

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

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index c107d556988c..4365c11e5844 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=10
+revision=11
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -13,11 +13,11 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 5f09edccbd1b9a91d19215e657907aaa88641d9d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 2 Apr 2021 23:44:24 -0700
Subject: [PATCH 0436/2024] GCP-base: fix license

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

diff --git a/srcpkgs/GCP-base/template b/srcpkgs/GCP-base/template
index 2bc890b9ce49..cd2477e3644a 100644
--- a/srcpkgs/GCP-base/template
+++ b/srcpkgs/GCP-base/template
@@ -1,7 +1,7 @@
 # Template file for 'GCP-base'
 pkgname=GCP-base
 version=1
-revision=2
+revision=3
 archs="x86_64*"
 build_style=meta
 depends="grub GCP-Guest-Environment"
@@ -11,5 +11,5 @@ short_desc="Base components for the Google Cloud Platform images"
 # when I have free time.  I use my work email for this only because it
 # makes a little more sense to me than my VoidLinux email.
 maintainer="Michael Aldridge <themaldridge@google.com>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="http://cloud.google.com/"

From 66106df34e43f0ca77888944d196661e6b88d585 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 09:55:46 -0700
Subject: [PATCH 0437/2024] SDL2_gfx: fix license, orphan

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

diff --git a/srcpkgs/SDL2_gfx/template b/srcpkgs/SDL2_gfx/template
index 3309d66d14be..3271922c112d 100644
--- a/srcpkgs/SDL2_gfx/template
+++ b/srcpkgs/SDL2_gfx/template
@@ -1,13 +1,13 @@
 # Template file for 'SDL2_gfx'
 pkgname=SDL2_gfx
 version=1.0.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel"
 short_desc="SDL graphics drawing primitives"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="zlib"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Zlib"
 homepage="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
 distfiles="http://www.ferzkopp.net/Software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262
@@ -35,4 +35,3 @@ SDL2_gfx-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-

From 4724378f102090b1488d118f53a2863feb385101 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:19:35 -0700
Subject: [PATCH 0438/2024] SDL_gfx: fix license, orphan

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

diff --git a/srcpkgs/SDL_gfx/template b/srcpkgs/SDL_gfx/template
index 65afe0ead7b1..5af9730e6143 100644
--- a/srcpkgs/SDL_gfx/template
+++ b/srcpkgs/SDL_gfx/template
@@ -1,13 +1,13 @@
 # Template file for 'SDL_gfx'
 pkgname=SDL_gfx
 version=2.0.26
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL-devel"
 short_desc="Graphics drawing primitives for SDL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="BSD"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
 homepage="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
 distfiles="http://www.ferzkopp.net/Software/SDL_gfx-${version%.*}/SDL_gfx-${version}.tar.gz"
 checksum=7ceb4ffb6fc63ffba5f1290572db43d74386cd0781c123bc912da50d34945446
@@ -36,4 +36,3 @@ SDL_gfx-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-

From 974a2cdb946dbc3fb2517f1e42620d988eb70902 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:28:40 -0700
Subject: [PATCH 0439/2024] SDL_image: fix license

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

diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template
index 5a85cda78ff5..05681e6da03c 100644
--- a/srcpkgs/SDL_image/template
+++ b/srcpkgs/SDL_image/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_image'
 pkgname=SDL_image
 version=1.2.12
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ makedepends="libpng-devel tiff-devel SDL-devel libwebp-devel"
 depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.4.0"
 short_desc="Load images as SDL surfaces"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://www.libsdl.org/projects/SDL_image/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 checksum=0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699

From 367f1db7061cfccced44c0ed56517c07fd61b8d0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:31:16 -0700
Subject: [PATCH 0440/2024] SDL_mixer: fix license

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

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 14c9815b4f60..0d05685fb0d9 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ makedepends="SDL-devel libvorbis-devel libmikmod-devel libflac-devel smpeg-devel
 depends="libvorbis libmikmod smpeg libflac"
 short_desc="Multi-channel audio mixer library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://www.libsdl.org/projects/SDL_mixer/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 checksum=1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a

From 53d2ec65fa92de33e147496b789cd23f2ea6ce75 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:32:00 -0700
Subject: [PATCH 0441/2024] SDL_net: fix license

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

diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template
index 49a5bed74b65..81fadf794bc3 100644
--- a/srcpkgs/SDL_net/template
+++ b/srcpkgs/SDL_net/template
@@ -1,14 +1,14 @@
 # Template file for 'SDL_net'
 pkgname=SDL_net
 version=1.2.8
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="SDL-devel"
 short_desc="Small sample cross-platform networking library for SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://www.libsdl.org/projects/SDL_net/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 checksum=5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4

From 1c3dfb7330db476a5de9d803dcf7b53a1ad9a73c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:37:13 -0700
Subject: [PATCH 0442/2024] SDL_sound: fix license

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

diff --git a/srcpkgs/SDL_sound/template b/srcpkgs/SDL_sound/template
index 8ff6d577906e..18500ef3f2af 100644
--- a/srcpkgs/SDL_sound/template
+++ b/srcpkgs/SDL_sound/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_sound'
 pkgname=SDL_sound
 version=1.0.3
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="SDL-devel libmikmod-devel libvorbis-devel
  libflac-devel speex-devel smpeg-devel"
 short_desc="Library to decode several popular sound file formats"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://icculus.org/SDL_sound/"
 distfiles="http://icculus.org/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
 checksum=3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df

From 01ec4ac4d04df56d589f38b4c2e6a15a8c8cbda8 Mon Sep 17 00:00:00 2001
From: DirectorX <DirectorX@users.noreply.github.com>
Date: Sat, 3 Apr 2021 01:31:15 +0300
Subject: [PATCH 0443/2024] hopper: update to 4.7.3.

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

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index a139bb5be275..65aab3cee604 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.2
+version=4.7.3
 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=04b38a512896c220b8aa1870564ab0cce3d1b477037bde4071034f4670863ac4
+checksum=141aa160e37e39c4bab244589999f7e977dffc241a1a5c21b8868079485bcbe8
 
 archs="x86_64"
 restricted=yes

From 6d1cafe8885b2653ce7f638cea13fe37e8085149 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:26:44 -0700
Subject: [PATCH 0444/2024] fastjar: fix license

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

diff --git a/srcpkgs/fastjar/template b/srcpkgs/fastjar/template
index 8cf752699d20..6eab069f60ef 100644
--- a/srcpkgs/fastjar/template
+++ b/srcpkgs/fastjar/template
@@ -1,12 +1,12 @@
 # Template file for 'fastjar'
 pkgname=fastjar
 version=0.98
-revision=2
+revision=3
 build_style=gnu-configure
 makedepends="zlib-devel"
 short_desc="C implementation of Oracle's jar utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://savannah.nongnu.org/projects/fastjar"
 distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145

From 251987d0ca0adc01fa605bad1e850893ad9310d6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:30:41 -0700
Subject: [PATCH 0445/2024] fbset: fix license

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

diff --git a/srcpkgs/fbset/template b/srcpkgs/fbset/template
index 05b2c28c27dc..22c51fae0eb7 100644
--- a/srcpkgs/fbset/template
+++ b/srcpkgs/fbset/template
@@ -1,13 +1,13 @@
 # Template file for 'fbset'
 pkgname=fbset
 version=2.1
-revision=5
+revision=6
 conf_files="/etc/fb.modes"
 hostmakedepends="flex"
 makedepends="libfl-devel"
 short_desc="Framebuffer device maintenance program"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://users.telenet.be/geertu/Linux/fbdev/"
 distfiles="${DEBIAN_SITE}/main/f/fbset/fbset_${version}.orig.tar.gz"
 checksum=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338

From 29b920914ac0986f55ad432d4650de360560768b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:53:10 -0700
Subject: [PATCH 0446/2024] fcron: fix license

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

diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template
index 231dd79c02b9..11efd44b0bbd 100644
--- a/srcpkgs/fcron/template
+++ b/srcpkgs/fcron/template
@@ -1,7 +1,7 @@
 # Template file for 'fcron'
 pkgname=fcron
 version=3.3.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="
 	--sysconfdir=/etc/fcron
@@ -27,7 +27,7 @@ makedepends="pam-devel readline-devel"
 depends="run-parts"
 short_desc="Feature-rich cron implementation"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://fcron.free.fr"
 distfiles="$homepage/archives/$pkgname-$version.src.tar.gz"
 checksum=9aead33a0926e2eec123698c502114c6d67b483fe1ec232969fae6809b0bab60

From ddd35d48f180e01cc2f2d645a87568ec32713889 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 20:07:59 -0700
Subject: [PATCH 0447/2024] flowcanvas: fix license

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

diff --git a/srcpkgs/flowcanvas/template b/srcpkgs/flowcanvas/template
index 261538cf56d8..4b61be701061 100644
--- a/srcpkgs/flowcanvas/template
+++ b/srcpkgs/flowcanvas/template
@@ -1,13 +1,13 @@
 # Template file for 'flowcanvas'
 pkgname=flowcanvas
 version=0.7.1
-revision=8
+revision=9
 build_style=waf
 hostmakedepends="pkg-config python"
 makedepends="gtkmm2-devel libgnomecanvasmm-devel graphviz-devel boost-devel"
 short_desc="Interactive canvas widget for boxes-and-lines style environments"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://drobilla.net/software/flowcanvas/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
 checksum=047928d858fd1e9296a9984de7468c86bbe23fc42e286691b8f273541402c596

From 9308aa671470f792f3d57cb5a0392e430ef725e3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:18:28 -0700
Subject: [PATCH 0448/2024] fltk: fix license

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

diff --git a/srcpkgs/fltk/template b/srcpkgs/fltk/template
index de19b7a86c4d..9da862de10b7 100644
--- a/srcpkgs/fltk/template
+++ b/srcpkgs/fltk/template
@@ -1,7 +1,7 @@
 # Template file for 'fltk'
 pkgname=fltk
 version=1.3.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-threads --enable-xft --enable-shared"
 hostmakedepends="man-db"
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel libpng-devel MesaLib-devel alsa-lib-devel
  freetype-devel libXinerama-devel libXft-devel"
 short_desc="Cross-platform C++ GUI toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-only WITH FLTK-exception"
+license="custom:LGPL-2.0-only WITH FLTK-exception"
 homepage="https://www.fltk.org/"
 distfiles="https://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"
 checksum=8729b2a055f38c1636ba20f749de0853384c1d3e9d1a6b8d4d1305143e115702
@@ -26,6 +26,7 @@ post_build() {
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/man/cat[13]
+	vlicense COPYING
 }
 
 fltk-devel_package() {

From 2b3e941220d0752cd1a8a5aa3d14b8825dda334d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:25:00 -0700
Subject: [PATCH 0449/2024] flvstreamer: orphan package, fix license

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

diff --git a/srcpkgs/flvstreamer/template b/srcpkgs/flvstreamer/template
index c8de3e6555dd..423cdf54bfa7 100644
--- a/srcpkgs/flvstreamer/template
+++ b/srcpkgs/flvstreamer/template
@@ -1,11 +1,11 @@
 # Template file for 'flvstreamer'
 pkgname=flvstreamer
 version=2.1c1
-revision=2
+revision=3
 wrksrc="${pkgname}"
 short_desc="Command-line RTMP client"
-maintainer="Juergen Buchmueller <pullmoll@t-online.de>"
-license="GPL-2"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="https://savannah.nongnu.org/projects/flvstreamer"
 distfiles="http://download.savannah.gnu.org/releases/flvstreamer/source/${pkgname}-${version}.tar.gz"
 checksum=e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee

From 55038bcf061b6ec05a647deba00929c520e46b1e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:37:19 -0700
Subject: [PATCH 0450/2024] font-adobe-*: fix license

Upstream considers this an MIT license, even if the text doesn't match.
Fixes 75dpi, 100dpi, utopia-100dpi, utopia-75dpi, utopia-type1
---
 srcpkgs/font-adobe-100dpi/template        | 7 ++++---
 srcpkgs/font-adobe-75dpi/template         | 7 ++++---
 srcpkgs/font-adobe-utopia-100dpi/template | 7 ++++---
 srcpkgs/font-adobe-utopia-75dpi/template  | 7 ++++---
 srcpkgs/font-adobe-utopia-type1/template  | 7 ++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/font-adobe-100dpi/template b/srcpkgs/font-adobe-100dpi/template
index 37862db9ec72..0043b1810eff 100644
--- a/srcpkgs/font-adobe-100dpi/template
+++ b/srcpkgs/font-adobe-100dpi/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-100dpi'
 pkgname=font-adobe-100dpi
 version=1.0.3
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/100dpi"
 short_desc="Standard 100dpi Adobe PCF fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054
+font_dirs="/usr/share/fonts/X11/100dpi"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }
diff --git a/srcpkgs/font-adobe-75dpi/template b/srcpkgs/font-adobe-75dpi/template
index 672a2d464921..e1abd11a928b 100644
--- a/srcpkgs/font-adobe-75dpi/template
+++ b/srcpkgs/font-adobe-75dpi/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-75dpi'
 pkgname=font-adobe-75dpi
 version=1.0.3
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/75dpi"
 short_desc="Standard 75pi Adobe PCF fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09
+font_dirs="/usr/share/fonts/X11/75dpi"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }
diff --git a/srcpkgs/font-adobe-utopia-100dpi/template b/srcpkgs/font-adobe-utopia-100dpi/template
index 3d6c43168650..495998ba7324 100644
--- a/srcpkgs/font-adobe-utopia-100dpi/template
+++ b/srcpkgs/font-adobe-utopia-100dpi/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-utopia-100dpi'
 pkgname=font-adobe-utopia-100dpi
 version=1.0.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/100dpi"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5
+font_dirs="/usr/share/fonts/X11/100dpi"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }
diff --git a/srcpkgs/font-adobe-utopia-75dpi/template b/srcpkgs/font-adobe-utopia-75dpi/template
index f83ecda61076..78d1c28a7b75 100644
--- a/srcpkgs/font-adobe-utopia-75dpi/template
+++ b/srcpkgs/font-adobe-utopia-75dpi/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-utopia-75dpi'
 pkgname=font-adobe-utopia-75dpi
 version=1.0.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/75dpi"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94
+font_dirs="/usr/share/fonts/X11/75dpi"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }
diff --git a/srcpkgs/font-adobe-utopia-type1/template b/srcpkgs/font-adobe-utopia-type1/template
index 3304aeef8442..e2ab4f439d9f 100644
--- a/srcpkgs/font-adobe-utopia-type1/template
+++ b/srcpkgs/font-adobe-utopia-type1/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-utopia-type1'
 pkgname=font-adobe-utopia-type1
 version=1.0.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/Type1"
 short_desc="Adobe Utopia Type1 fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077
+font_dirs="/usr/share/fonts/X11/Type1"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }

From 8531d0c8984ceff4a2fcae6681f26793225d5899 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:52:09 -0700
Subject: [PATCH 0451/2024] font-go-ttf: fix license, short_desc

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

diff --git a/srcpkgs/font-go-ttf/template b/srcpkgs/font-go-ttf/template
index 35df3ecac91e..4e3bfa69526b 100644
--- a/srcpkgs/font-go-ttf/template
+++ b/srcpkgs/font-go-ttf/template
@@ -1,12 +1,12 @@
 # Template file for 'font-go-ttf'
 pkgname=font-go-ttf
 version=0.0.20170330
-revision=1
+revision=2
 _gitrev=f03a046406d4d7fbfd4ed29f554da8f6114049fc
 wrksrc="image-${_gitrev}"
-short_desc="A typeface designed for go source code"
+short_desc="Typeface designed for go source code"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://blog.golang.org/go-fonts"
 distfiles="https://github.com/golang/image/archive/${_gitrev}.tar.gz"
 checksum=0bf07c87451c69540f2ebf85d0602393cff5b0c18e91b4d0104d1095070dcc71

From 105a8d2f90ae3bcdf450e25984a8d01a2f571094 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:55:12 -0700
Subject: [PATCH 0452/2024] font-open-dyslexic-ttf: fix license

---
 srcpkgs/font-open-dyslexic-ttf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-open-dyslexic-ttf/template b/srcpkgs/font-open-dyslexic-ttf/template
index ac882e135416..2d798b86a8b0 100644
--- a/srcpkgs/font-open-dyslexic-ttf/template
+++ b/srcpkgs/font-open-dyslexic-ttf/template
@@ -1,12 +1,12 @@
 # Template file for 'font-open-dyslexic-ttf'
 pkgname=font-open-dyslexic-ttf
 version=20160623
-revision=3
+revision=4
 wrksrc="open-dyslexic-${version}-Stable"
 depends="font-util xbps-triggers"
 short_desc="Font created to increase readability for readers with dyslexia"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="CC-BY-3.0, Bitstream"
+license="CC-BY-3.0, custom:Bitstream"
 homepage="http://opendyslexic.org/"
 distfiles="https://github.com/antijingoist/open-dyslexic/archive/${version}-Stable.tar.gz"
 checksum=a44fde7d5fcf1e3825d00de20f7d71fb7b339a7e71067cd9566e8ab16692802a

From c781dcc892f9676d18b094a6219f0321721f6745 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:03:13 -0700
Subject: [PATCH 0453/2024] font-tamsyn: fix license

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

diff --git a/srcpkgs/font-tamsyn/template b/srcpkgs/font-tamsyn/template
index 06a9102aaf81..37ad77637fed 100644
--- a/srcpkgs/font-tamsyn/template
+++ b/srcpkgs/font-tamsyn/template
@@ -1,12 +1,12 @@
 # Template file for 'font-tamsyn'
 pkgname=font-tamsyn
 version=1.11
-revision=2
+revision=3
 wrksrc=tamsyn-font-${version}
 depends="font-util xbps-triggers"
-short_desc="A monospaced programming font for the console and X11"
+short_desc="Monospaced programming font for the console and X11"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="custom"
+license="custom:Tamsyn"
 homepage="http://www.fial.com/~scott/tamsyn-font"
 distfiles="http://www.fial.com/~scott/tamsyn-font/download/tamsyn-font-${version}.tar.gz"
 checksum=97be1b604441b725548c454a92603993eb96e493f508845638a86c8d64fbf24e

From fa38c8dffff815a3ee1340fd0b566ddee1ce22bd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:05:30 -0700
Subject: [PATCH 0454/2024] font-tamzen: fix license

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

diff --git a